Merge branch 'hotfix'

* fix: Pro rata calculation is not working for WDV depreciation method

* fixed test cases and the logic for pro rata calculation

.eslintrc

@@ -51,7 +51,7 @@
 	"globals": {
 		"frappe": true,
 		"erpnext": true,
-		"schools": true,
+		"hub": true,
 
 		"$": true,
 		"jQuery": true,
@@ -132,6 +132,7 @@
 		"get_url_arg": true,
 		"get_server_fields": true,
 		"set_multiple": true,
-		"QUnit": true
+		"QUnit": true,
+		"Chart": true
 	}
 }

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,2 @@
+Please read the pull request checklist to make sure your changes are merged: https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist
+

.github/stale.yml

@@ -0,0 +1,34 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 30
+
+# Number of days of inactivity before a stale Issue or Pull Request is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 7
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - hotfix
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: true
+
+# Label to use when marking as stale
+staleLabel: inactive
+
+# Comment to post when marking as stale. Set to `false` to disable
+markComment: >
+  This pull request has been automatically marked as stale because it has not had
+  recent activity. It will be closed within a week if no further activity occurs, but it
+  only takes a comment to keep a contribution alive :) Also, even if it is closed,
+  you can always reopen the PR when you're ready. Thank you for contributing.
+  
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+# Limit to only `issues` or `pulls`
+only: pulls

.gitignore

@@ -8,3 +8,9 @@ latest_updates.json
 *.egg-info
 dist/
 erpnext/docs/current
+*.swp
+*.swo
+__pycache__
+*~
+.vscode/
+node_modules/

.travis.yml

@@ -1,25 +1,27 @@
 language: python
 dist: trusty
 
-addons:
-  apt:
-    sources:
-      - google-chrome
-    packages:
-      - google-chrome-stable
-
 python:
   - "2.7"
+  - "3.6"
+
+env:
+  - TEST_TYPE="Server Side Test"
+  - TEST_TYPE="Patch Test"
 
 services:
   - mysql
 
 install:
+  # fix mongodb travis error
+  - sudo rm /etc/apt/sources.list.d/mongodb*.list
   - pip install flake8==3.3.0
   - flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
   - sudo rm /etc/apt/sources.list.d/docker.list
+  - sudo apt-get install hhvm && rm -rf /home/travis/.kiex/
   - sudo apt-get purge -y mysql-common mysql-server mysql-client
-  - nvm install v7.10.0
+  - nvm install 10
+  - pip install python-coveralls
   - wget https://raw.githubusercontent.com/frappe/bench/master/playbooks/install.py
   - sudo python install.py --develop --user travis --without-bench-setup
   - sudo pip install -e ~/bench
@@ -29,15 +31,6 @@ install:
   - cp -r $TRAVIS_BUILD_DIR/test_sites/test_site ~/frappe-bench/sites/
 
 before_script:
-  - wget http://chromedriver.storage.googleapis.com/2.27/chromedriver_linux64.zip
-  - unzip chromedriver_linux64.zip
-  - sudo apt-get install libnss3
-  - sudo apt-get --only-upgrade install google-chrome-stable
-  - sudo cp chromedriver /usr/local/bin/.
-  - sudo chmod +x /usr/local/bin/chromedriver
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
-  - sleep 3
   - mysql -u root -ptravis -e 'create database test_frappe'
   - echo "USE mysql;\nCREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe';\nFLUSH PRIVILEGES;\n" | mysql -u root -ptravis
   - echo "USE mysql;\nGRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost';\n" | mysql -u root -ptravis
@@ -45,23 +38,14 @@ before_script:
   - cd ~/frappe-bench
   - bench get-app erpnext $TRAVIS_BUILD_DIR
   - bench use test_site
-  - bench reinstall --yes
-  - bench build
+  - bench reinstall --mariadb-root-username root --mariadb-root-password travis --yes
   - bench scheduler disable
+  - sed -i 's/9000/9001/g' sites/common_site_config.json
   - bench start &
   - sleep 10
 
-jobs:
-  include:
-    - stage: test
-      script:
-        - set -e
-        - bench run-tests
-      env: Server Side Test
-    - # stage
-      script:
-        - bench --verbose run-setup-wizard-ui-test
-        - bench execute erpnext.setup.utils.enable_all_roles_and_domains
-        - bench run-ui-tests --app erpnext
-      env: Client Side Test
+script:
+  - bash $TRAVIS_BUILD_DIR/travis/run-tests.sh
 
+after_script:
+  - coveralls -b apps/erpnext -d ../../sites/.coverage

MANIFEST.in

@@ -1,20 +0,0 @@
-include MANIFEST.in
-include requirements.txt
-include *.json
-include *.md
-include *.py
-include *.txt
-include .travis.yml
-recursive-include erpnext *.txt
-recursive-include erpnext *.css
-recursive-include erpnext *.csv
-recursive-include erpnext *.html
-recursive-include erpnext *.ico
-recursive-include erpnext *.js
-recursive-include erpnext *.json
-recursive-include erpnext *.md
-recursive-include erpnext *.png
-recursive-include erpnext *.py
-recursive-include erpnext *.svg
-recursive-include erpnext/public *
-recursive-exclude * *.pyc

README.md

@@ -1,14 +1,23 @@
-# ERPNext - ERP made simple
+<div align="center">
+    <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.org/frappe/erpnext.png)](https://travis-ci.org/frappe/erpnext) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/frappe/erpnext?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![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)
 
 [https://erpnext.com](https://erpnext.com)
 
+</div>
+
 Includes: Accounting, Inventory, Manufacturing, CRM, Sales, Purchase, Project Management, HRMS. Requires MariaDB.
 
-ERPNext is built on the [Frappé](https://github.com/frappe/frappe) Framework, a full-stack web app framework in Python & JavaScript.
+ERPNext is built on the [Frappe](https://github.com/frappe/frappe) Framework, a full-stack web app framework in Python & JavaScript.
 
-- [User Guide](https://erpnext.org/docs/user)
+- [User Guide](https://erpnext.com/docs/user)
 - [Discussion Forum](https://discuss.erpnext.com/)
 
 ---
@@ -31,15 +40,16 @@ System and user credentials are listed on the download page.
 
 ## License
 
-GNU/General Public License (see LICENSE.txt)
+GNU/General Public License (see [license.txt](license.txt))
 
-The ERPNext code is licensed as GNU General Public License (v3) and the Documentation is licensed as Creative Commons (CC-BY-SA-3.0) and the copyright is owned by Frappé Technologies Pvt Ltd (Frappé) and Contributors.
+The ERPNext code is licensed as GNU General Public License (v3) and the Documentation is licensed as Creative Commons (CC-BY-SA-3.0) and the copyright is owned by Frappe Technologies Pvt Ltd (Frappe) and Contributors.
 
 ---
 
 ## Contributing
 
 1. [Issue Guidelines](https://github.com/frappe/erpnext/wiki/Issue-Guidelines)
+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)
@@ -48,19 +58,19 @@ The ERPNext code is licensed as GNU General Public License (v3) and the Document
 
 ## Logo and Trademark
 
-The brand name ERPNext and the logo are trademarks of Frappé Technologies Pvt. Ltd.
+The brand name ERPNext and the logo are trademarks of Frappe Technologies Pvt. Ltd.
 
 ### Introduction
 
-Frappé Technologies Pvt. Ltd. (Frappé) owns and oversees the trademarks for the ERPNext name and logos. We have developed this trademark usage policy with the following goals in mind:
+Frappe Technologies Pvt. Ltd. (Frappe) owns and oversees the trademarks for the ERPNext name and logos. We have developed this trademark usage policy with the following goals in mind:
 
 - We’d like to make it easy for anyone to use the ERPNext name or logo for community-oriented efforts that help spread and improve ERPNext.
 - We’d like to make it clear how ERPNext-related businesses and projects can (and cannot) use the ERPNext name and logo.
 - We’d like to make it hard for anyone to use the ERPNext name and logo to unfairly profit from, trick or confuse people who are looking for official ERPNext resources.
 
-### Frappé Trademark Usage Policy
+### Frappe Trademark Usage Policy
 
-Permission from Frappé is required to use the ERPNext name or logo as part of any project, product, service, domain or company name.
+Permission from Frappe is required to use the ERPNext name or logo as part of any project, product, service, domain or company name.
 
 We will grant permission to use the ERPNext name and logo for projects that meet the following criteria:
 
@@ -71,7 +81,7 @@ Your project neither promotes nor is associated with entities that currently fai
 
 Use of the ERPNext name and logo is additionally allowed in the following situations:
 
-All other ERPNext-related businesses or projects can use the ERPNext name and logo to refer to and explain their services, but they cannot use them as part of a product, project, service, domain, or company name and they cannot use them in any way that suggests an affiliation with or endorsement by ERPNext or Frappé Technologies or the ERPNext open source project. For example, a consulting company can describe its business as “123 Web Services, offering ERPNext consulting for small businesses,” but cannot call its business “The ERPNext Consulting Company.”
+All other ERPNext-related businesses or projects can use the ERPNext name and logo to refer to and explain their services, but they cannot use them as part of a product, project, service, domain, or company name and they cannot use them in any way that suggests an affiliation with or endorsement by ERPNext or Frappe Technologies or the ERPNext open source project. For example, a consulting company can describe its business as “123 Web Services, offering ERPNext consulting for small businesses,” but cannot call its business “The ERPNext Consulting Company.”
 
 Similarly, it’s OK to use the ERPNext logo as part of a page that describes your products or services, but it is not OK to use it as part of your company or product logo or branding itself. Under no circumstances is it permitted to use ERPNext as part of a top-level domain name.
 
@@ -79,6 +89,6 @@ We do not allow the use of the trademark in advertising, including AdSense/AdWor
 
 Please note that it is not the goal of this policy to limit commercial activity around ERPNext. We encourage ERPNext-based businesses, and we would love to see hundreds of them.
 
-When in doubt about your use of the ERPNext name or logo, please contact Frappé Technologies for clarification.
+When in doubt about your use of the ERPNext name or logo, please contact Frappe Technologies for clarification.
 
 (inspired by WordPress)

attributions.md

@@ -1,6 +1,6 @@
 ## ERPNext includes these public works
 
-For Frappé Framework, please see attributions.md at https://github.com/frappe/frappe/
+For Frappe Framework, please see attributions.md at https://github.com/frappe/frappe/
 
 #### Images
 

erpnext/__init__.py

@@ -3,8 +3,9 @@ from __future__ import unicode_literals
 import inspect
 import frappe
 from erpnext.hooks import regional_overrides
+from frappe.utils import getdate
 
-__version__ = '9.2.1'
+__version__ = '11.1.49'
 
 def get_default_company(user=None):
 	'''Get default company for user'''
@@ -26,7 +27,7 @@ def get_default_currency():
 	'''Returns the currency of the default company'''
 	company = get_default_company()
 	if company:
-		return frappe.db.get_value('Company', company, 'default_currency')
+		return frappe.get_cached_value('Company',  company,  'default_currency')
 
 def get_default_cost_center(company):
 	'''Returns the default cost center of the company'''
@@ -36,7 +37,7 @@ def get_default_cost_center(company):
 	if not frappe.flags.company_cost_center:
 		frappe.flags.company_cost_center = {}
 	if not company in frappe.flags.company_cost_center:
-		frappe.flags.company_cost_center[company] = frappe.db.get_value('Company', company, 'cost_center')
+		frappe.flags.company_cost_center[company] = frappe.get_cached_value('Company',  company,  'cost_center')
 	return frappe.flags.company_cost_center[company]
 
 def get_company_currency(company):
@@ -44,7 +45,7 @@ def get_company_currency(company):
 	if not frappe.flags.company_currency:
 		frappe.flags.company_currency = {}
 	if not company in frappe.flags.company_currency:
-		frappe.flags.company_currency[company] = frappe.db.get_value('Company', company, 'default_currency')
+		frappe.flags.company_currency[company] = frappe.db.get_value('Company',  company,  'default_currency', cache=True)
 	return frappe.flags.company_currency[company]
 
 def set_perpetual_inventory(enable=1, company=None):
@@ -57,7 +58,7 @@ def set_perpetual_inventory(enable=1, company=None):
 
 def encode_company_abbr(name, company):
 	'''Returns name encoded with company abbreviation'''
-	company_abbr = frappe.db.get_value("Company", company, "abbr")
+	company_abbr = frappe.get_cached_value('Company',  company,  "abbr")
 	parts = name.rsplit(" - ", 1)
 
 	if parts[-1].lower() != company_abbr.lower():
@@ -73,19 +74,42 @@ def is_perpetual_inventory_enabled(company):
 		frappe.local.enable_perpetual_inventory = {}
 
 	if not company in frappe.local.enable_perpetual_inventory:
-		frappe.local.enable_perpetual_inventory[company] = frappe.db.get_value("Company",
-			company, "enable_perpetual_inventory") or 0
+		frappe.local.enable_perpetual_inventory[company] = frappe.get_cached_value('Company',
+			company,  "enable_perpetual_inventory") or 0
 
 	return frappe.local.enable_perpetual_inventory[company]
 
+def get_default_finance_book(company=None):
+	if not company:
+		company = get_default_company()
+
+	if not hasattr(frappe.local, 'default_finance_book'):
+		frappe.local.default_finance_book = {}
+
+	if not company in frappe.local.default_finance_book:
+		frappe.local.default_finance_book[company] = frappe.get_cached_value('Company',
+			company,  "default_finance_book")
+
+	return frappe.local.default_finance_book[company]
+
+def get_party_account_type(party_type):
+	if not hasattr(frappe.local, 'party_account_types'):
+		frappe.local.party_account_types = {}
+
+	if not party_type in frappe.local.party_account_types:
+		frappe.local.party_account_types[party_type] = frappe.db.get_value("Party Type",
+			party_type, "account_type") or ''
+
+	return frappe.local.party_account_types[party_type]
+
 def get_region(company=None):
 	'''Return the default country based on flag, company or global settings
 
 	You can also set global company flag in `frappe.flags.company`
 	'''
 	if company or frappe.flags.company:
-		return frappe.db.get_value('Company',
-			company or frappe.flags.company, 'country')
+		return frappe.get_cached_value('Company',
+			company or frappe.flags.company,  'country')
 	elif frappe.flags.country:
 		return frappe.flags.country
 	else:
@@ -108,3 +132,16 @@ def allow_regional(fn):
 
 	return caller
 
+def get_last_membership():
+	'''Returns last membership if exists'''
+	last_membership = frappe.get_all('Membership', 'name,to_date,membership_type',
+		dict(member=frappe.session.user, paid=1), order_by='to_date desc', limit=1)
+
+	return last_membership and last_membership[0]
+
+def is_member():
+	'''Returns true if the user is still a member'''
+	last_membership = get_last_membership()
+	if last_membership and getdate(last_membership.to_date) > getdate():
+		return True
+	return False

erpnext/accounts/deferred_revenue.py

@@ -0,0 +1,213 @@
+from __future__ import unicode_literals
+
+import frappe
+from frappe import _
+from frappe.utils import date_diff, add_months, today, getdate, add_days, flt, get_last_day
+from erpnext.accounts.utils import get_account_currency
+from frappe.email import sendmail_to_system_managers
+
+def validate_service_stop_date(doc):
+	''' Validates service_stop_date for Purchase Invoice and Sales Invoice '''
+
+	enable_check = "enable_deferred_revenue" \
+		if doc.doctype=="Sales Invoice" else "enable_deferred_expense"
+
+	old_stop_dates = {}
+	old_doc = frappe.db.get_all("{0} Item".format(doc.doctype),
+		{"parent": doc.name}, ["name", "service_stop_date"])
+
+	for d in old_doc:
+		old_stop_dates[d.name] = d.service_stop_date or ""
+
+	for item in doc.items:
+		if not item.get(enable_check): continue
+
+		if item.service_stop_date:
+			if date_diff(item.service_stop_date, item.service_start_date) < 0:
+				frappe.throw(_("Service Stop Date cannot be before Service Start Date"))
+
+			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[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):
+	# book the expense/income on the last day, but it will be trigger on the 1st of month at 12:00 AM
+	if not start_date:
+		start_date = add_months(today(), -1)
+	if not end_date:
+		end_date = add_days(today(), -1)
+
+	# check for the purchase invoice for which GL entries has to be done
+	invoices = frappe.db.sql_list('''
+		select distinct parent from `tabPurchase Invoice Item`
+		where service_start_date<=%s and service_end_date>=%s
+		and enable_deferred_expense = 1 and docstatus = 1 and ifnull(amount, 0) > 0
+	''', (end_date, start_date))
+
+	# For each invoice, book deferred expense
+	for invoice in invoices:
+		doc = frappe.get_doc("Purchase Invoice", invoice)
+		book_deferred_income_or_expense(doc, end_date)
+
+def convert_deferred_revenue_to_income(start_date=None, end_date=None):
+	# book the expense/income on the last day, but it will be trigger on the 1st of month at 12:00 AM
+	if not start_date:
+		start_date = add_months(today(), -1)
+	if not end_date:
+		end_date = add_days(today(), -1)
+
+	# check for the sales invoice for which GL entries has to be done
+	invoices = frappe.db.sql_list('''
+		select distinct parent from `tabSales Invoice Item`
+		where service_start_date<=%s and service_end_date>=%s
+		and enable_deferred_revenue = 1 and docstatus = 1 and ifnull(amount, 0) > 0
+	''', (end_date, start_date))
+
+	for invoice in invoices:
+		doc = frappe.get_doc("Sales Invoice", invoice)
+		book_deferred_income_or_expense(doc, end_date)
+
+def get_booking_dates(doc, item, posting_date=None):
+	if not posting_date:
+		posting_date = add_days(today(), -1)
+
+	last_gl_entry = False
+
+	deferred_account = "deferred_revenue_account" if doc.doctype=="Sales Invoice" else "deferred_expense_account"
+
+	prev_gl_entry = frappe.db.sql('''
+		select name, posting_date from `tabGL Entry` where company=%s and account=%s and
+		voucher_type=%s and voucher_no=%s and voucher_detail_no=%s
+		order by posting_date desc limit 1
+	''', (doc.company, item.get(deferred_account), doc.doctype, doc.name, item.name), as_dict=True)
+
+	if prev_gl_entry:
+		start_date = getdate(add_days(prev_gl_entry[0].posting_date, 1))
+	else:
+		start_date = item.service_start_date
+
+	end_date = get_last_day(start_date)
+	if end_date >= item.service_end_date:
+		end_date = item.service_end_date
+		last_gl_entry = True
+	elif item.service_stop_date and end_date >= item.service_stop_date:
+		end_date = item.service_stop_date
+		last_gl_entry = True
+
+	if end_date > getdate(posting_date):
+		end_date = posting_date
+
+	if getdate(start_date) <= getdate(end_date):
+		return start_date, end_date, last_gl_entry
+	else:
+		return None, None, None
+
+def calculate_amount(doc, item, last_gl_entry, total_days, total_booking_days, account_currency):
+	if doc.doctype == "Sales Invoice":
+		total_credit_debit, total_credit_debit_currency = "debit", "debit_in_account_currency"
+		deferred_account = "deferred_revenue_account"
+	else:
+		total_credit_debit, total_credit_debit_currency = "credit", "credit_in_account_currency"
+		deferred_account = "deferred_expense_account"
+
+	amount, base_amount = 0, 0
+	if not last_gl_entry:
+		base_amount = flt(item.base_net_amount*total_booking_days/flt(total_days), item.precision("base_net_amount"))
+		if account_currency==doc.company_currency:
+			amount = base_amount
+		else:
+			amount = flt(item.net_amount*total_booking_days/flt(total_days), item.precision("net_amount"))
+	else:
+		gl_entries_details = frappe.db.sql('''
+			select sum({0}) as total_credit, sum({1}) as total_credit_in_account_currency, voucher_detail_no
+			from `tabGL Entry` where company=%s and account=%s and voucher_type=%s and voucher_no=%s and voucher_detail_no=%s
+			group by voucher_detail_no
+		'''.format(total_credit_debit, total_credit_debit_currency),
+			(doc.company, item.get(deferred_account), doc.doctype, doc.name, item.name), as_dict=True)
+		already_booked_amount = gl_entries_details[0].total_credit if gl_entries_details else 0
+		base_amount = flt(item.base_net_amount - already_booked_amount, item.precision("base_net_amount"))
+		if account_currency==doc.company_currency:
+			amount = base_amount
+		else:
+			already_booked_amount_in_account_currency = gl_entries_details[0].total_credit_in_account_currency if gl_entries_details else 0
+			amount = flt(item.net_amount - already_booked_amount_in_account_currency, item.precision("net_amount"))
+
+	return amount, base_amount
+
+def book_deferred_income_or_expense(doc, posting_date=None):
+	enable_check = "enable_deferred_revenue" \
+		if doc.doctype=="Sales Invoice" else "enable_deferred_expense"
+
+	def _book_deferred_revenue_or_expense(item):
+		start_date, end_date, last_gl_entry = get_booking_dates(doc, item, posting_date=posting_date)
+		if not (start_date and end_date): return
+
+		account_currency = get_account_currency(item.expense_account)
+		if doc.doctype == "Sales Invoice":
+			against, project = doc.customer, doc.project
+			credit_account, debit_account = item.income_account, item.deferred_revenue_account
+		else:
+			against, project = doc.supplier, item.project
+			credit_account, debit_account = item.deferred_expense_account, item.expense_account
+
+		total_days = date_diff(item.service_end_date, item.service_start_date) + 1
+		total_booking_days = date_diff(end_date, start_date) + 1
+
+		amount, base_amount = calculate_amount(doc, item, last_gl_entry,
+			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.name)
+
+		if getdate(end_date) < getdate(posting_date) and not last_gl_entry:
+			_book_deferred_revenue_or_expense(item)
+
+
+	for item in doc.get('items'):
+		if item.get(enable_check):
+			_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, voucher_detail_no):
+	# GL Entry for crediting the amount in the deferred expense
+	from erpnext.accounts.general_ledger import make_gl_entries
+
+	gl_entries = []
+	gl_entries.append(
+		doc.get_gl_dict({
+			"account": credit_account,
+			"against": against,
+			"credit": base_amount,
+			"credit_in_account_currency": amount,
+			"cost_center": cost_center,
+			"voucher_detail_no": voucher_detail_no,
+			'posting_date': posting_date,
+			'project': project
+		}, account_currency)
+	)
+	# GL Entry to debit the amount from the expense
+	gl_entries.append(
+		doc.get_gl_dict({
+			"account": debit_account,
+			"against": against,
+			"debit": base_amount,
+			"debit_in_account_currency": amount,
+			"cost_center": cost_center,
+			"voucher_detail_no": voucher_detail_no,
+			'posting_date': posting_date,
+			'project': project
+		}, account_currency)
+	)
+
+	if gl_entries:
+		try:
+			make_gl_entries(gl_entries, cancel=(doc.docstatus == 2), merge_entries=True)
+			frappe.db.commit()
+		except:
+			frappe.db.rollback()
+			title = _("Error while processing deferred accounting for {0}").format(doc.name)
+			traceback = frappe.get_traceback()
+			frappe.log_error(message=traceback , title=title)
+			sendmail_to_system_managers(title, traceback)

erpnext/accounts/doctype/account/account.js

@@ -17,18 +17,13 @@ frappe.ui.form.on('Account', {
 		});
 	},
 	refresh: function(frm) {
-		if (frm.doc.__islocal) {
-			frappe.msgprint(__("Please create new account from Chart of Accounts."));
-			throw "cannot create";
-		}
-
-		frm.toggle_display('account_name', frm.doc.__islocal);
+		frm.toggle_display('account_name', frm.is_new());
 
 		// hide fields if group
 		frm.toggle_display(['account_type', 'tax_rate'], cint(frm.doc.is_group) == 0);
 
 		// disable fields
-		frm.toggle_enable(['account_name', 'is_group', 'company'], false);
+		frm.toggle_enable(['is_group', 'company'], false);
 
 		if (cint(frm.doc.is_group) == 0) {
 			frm.toggle_display('freeze_account', frm.doc.__onload
@@ -36,16 +31,25 @@ frappe.ui.form.on('Account', {
 		}
 
 		// read-only for root accounts
-		if (!frm.doc.parent_account) {
-			frm.set_read_only();
-			frm.set_intro(__("This is a root account and cannot be edited."));
-		} else {
-			// credit days and type if customer or supplier
-			frm.set_intro(null);
-			frm.trigger('account_type');
-
-			// show / hide convert buttons
-			frm.trigger('add_toolbar_buttons');
+		if (!frm.is_new()) {
+			if (!frm.doc.parent_account) {
+				frm.set_read_only();
+				frm.set_intro(__("This is a root account and cannot be edited."));
+			} else {
+				// credit days and type if customer or supplier
+				frm.set_intro(null);
+				frm.trigger('account_type');
+				// show / hide convert buttons
+				frm.trigger('add_toolbar_buttons');
+			}
+			if (frm.has_perm('write')) {
+				frm.add_custom_button(__('Update Account Name / Number'), function () {
+					frm.trigger("update_account_number");
+				});
+				frm.add_custom_button(__('Merge Account'), function () {
+					frm.trigger("merge_account");
+				});
+			}
 		}
 	},
 	account_type: function (frm) {
@@ -90,6 +94,93 @@ frappe.ui.form.on('Account', {
 				});
 			});
 		}
+	},
 
+	merge_account: function(frm) {
+		var d = new frappe.ui.Dialog({
+			title: __('Merge with Existing Account'),
+			fields: [
+				{
+					"label" : "Name",
+					"fieldname": "name",
+					"fieldtype": "Data",
+					"reqd": 1,
+					"default": frm.doc.name
+				}
+			],
+			primary_action: function() {
+				var data = d.get_values();
+				frappe.call({
+					method: "erpnext.accounts.doctype.account.account.merge_account",
+					args: {
+						old: frm.doc.name,
+						new: data.name,
+						is_group: frm.doc.is_group,
+						root_type: frm.doc.root_type,
+						company: frm.doc.company
+					},
+					callback: function(r) {
+						if(!r.exc) {
+							if(r.message) {
+								frappe.set_route("Form", "Account", r.message);
+							}
+							d.hide();
+						}
+					}
+				});
+			},
+			primary_action_label: __('Merge')
+		});
+		d.show();
+	},
+
+	update_account_number: function(frm) {
+		var d = new frappe.ui.Dialog({
+			title: __('Update Account Number / Name'),
+			fields: [
+				{
+					"label": "Account Name",
+					"fieldname": "account_name",
+					"fieldtype": "Data",
+					"reqd": 1,
+					"default": frm.doc.account_name
+				},
+				{
+					"label": "Account Number",
+					"fieldname": "account_number",
+					"fieldtype": "Data",
+					"default": frm.doc.account_number
+				}
+			],
+			primary_action: function() {
+				var data = d.get_values();
+				if(data.account_number === frm.doc.account_number && data.account_name === frm.doc.account_name) {
+					d.hide();
+					return;
+				}
+
+				frappe.call({
+					method: "erpnext.accounts.doctype.account.account.update_account_number",
+					args: {
+						account_number: data.account_number,
+						account_name: data.account_name,
+						name: frm.doc.name
+					},
+					callback: function(r) {
+						if(!r.exc) {
+							if(r.message) {
+								frappe.set_route("Form", "Account", r.message);
+							} else {
+								frm.set_value("account_number", data.account_number);
+								frm.set_value("account_name", data.account_name);
+							}
+							d.hide();
+						}
+					}
+				});
+			},
+			primary_action_label: __('Update')
+		});
+		d.show();
 	}
-});
+});

erpnext/accounts/doctype/account/account.json

@@ -1,8 +1,9 @@
 {
  "allow_copy": 1, 
+ "allow_events_in_timeline": 0, 
  "allow_guest_to_view": 0, 
  "allow_import": 1, 
- "allow_rename": 1, 
+ "allow_rename": 0, 
  "beta": 0, 
  "creation": "2013-01-30 12:49:46", 
  "custom": 0, 
@@ -14,6 +15,7 @@
  "fields": [
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -40,10 +42,12 @@
    "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, 
@@ -68,11 +72,13 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "50%"
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -94,16 +100,50 @@
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 1, 
+   "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, 
+   "fieldname": "account_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": "Account 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
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -131,10 +171,12 @@
    "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, 
@@ -163,10 +205,12 @@
    "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, 
@@ -193,10 +237,12 @@
    "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, 
@@ -223,10 +269,12 @@
    "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, 
@@ -255,10 +303,45 @@
    "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", 
+   "fieldname": "inter_company_account", 
+   "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": "Inter Company 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
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -283,11 +366,13 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "50%"
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -316,10 +401,12 @@
    "reqd": 1, 
    "search_index": 1, 
    "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, 
@@ -339,7 +426,7 @@
    "no_copy": 0, 
    "oldfieldname": "account_type", 
    "oldfieldtype": "Select", 
-   "options": "\nAccumulated Depreciation\nBank\nCash\nChargeable\nCost of Goods Sold\nDepreciation\nEquity\nExpense Account\nExpenses Included In Valuation\nFixed Asset\nIncome Account\nPayable\nReceivable\nRound Off\nStock\nStock Adjustment\nStock Received But Not Billed\nTax\nTemporary", 
+   "options": "\nAccumulated Depreciation\nAsset Received But Not Billed\nBank\nCash\nChargeable\nCapital Work in Progress\nCost of Goods Sold\nDepreciation\nEquity\nExpense Account\nExpenses Included In Asset Valuation\nExpenses Included In Valuation\nFixed Asset\nIncome Account\nPayable\nReceivable\nRound Off\nStock\nStock Adjustment\nStock Received But Not Billed\nTax\nTemporary", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -349,10 +436,12 @@
    "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, 
@@ -381,10 +470,12 @@
    "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, 
@@ -414,10 +505,12 @@
    "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, 
@@ -444,10 +537,12 @@
    "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, 
@@ -473,10 +568,12 @@
    "reqd": 0, 
    "search_index": 1, 
    "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, 
@@ -502,10 +599,12 @@
    "reqd": 0, 
    "search_index": 1, 
    "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, 
@@ -531,6 +630,40 @@
    "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, 
+   "depends_on": "eval:(doc.report_type == 'Profit and Loss' && !doc.is_group)", 
+   "fieldname": "include_in_gross", 
+   "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": "Include in gross", 
+   "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
   }
  ], 
@@ -545,7 +678,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-08-11 15:28:35.855809", 
+ "modified": "2019-03-04 14:42:07.208893", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Account", 
@@ -553,7 +686,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -573,7 +705,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -593,7 +724,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -613,7 +743,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -633,7 +762,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -655,9 +783,10 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "search_fields": "", 
+ "search_fields": "account_number", 
  "show_name_in_global_search": 1, 
  "sort_order": "ASC", 
  "track_changes": 1, 
- "track_seen": 0
+ "track_seen": 0, 
+ "track_views": 0
 }

erpnext/accounts/doctype/account/account.py

@@ -3,15 +3,20 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.utils import cint, fmt_money
+from frappe.utils import cint, cstr
 from frappe import throw, _
-from frappe.model.document import Document
+from frappe.utils.nestedset import NestedSet, get_ancestors_of, get_descendants_of
 
 class RootNotEditable(frappe.ValidationError): pass
 class BalanceMismatchError(frappe.ValidationError): pass
 
-class Account(Document):
+class Account(NestedSet):
 	nsm_parent_field = 'parent_account'
+	def on_update(self):
+		if frappe.local.flags.ignore_on_update:
+			return
+		else:
+			super(Account, self).on_update()
 
 	def onload(self):
 		frozen_accounts_modifier = frappe.db.get_value("Accounts Settings", "Accounts Settings",
@@ -20,24 +25,23 @@ class Account(Document):
 			self.set_onload("can_freeze_account", True)
 
 	def autoname(self):
-		# first validate if company exists
-		company = frappe.db.get_value("Company", self.company, ["abbr", "name"], as_dict=True)
-		if not company:
-			frappe.throw(_('Company {0} does not exist').format(self.company))
-
-		self.name = self.account_name.strip() + ' - ' + company.abbr
+		from erpnext.accounts.utils import get_autoname_with_number
+		self.name = get_autoname_with_number(self.account_number, self.account_name, None, self.company)
 
 	def validate(self):
+		from erpnext.accounts.utils import validate_field_number
 		if frappe.local.flags.allow_unverified_charts:
 			return
 		self.validate_parent()
 		self.validate_root_details()
+		validate_field_number("Account", self.name, self.account_number, self.company, "account_number")
 		self.validate_group_or_ledger()
 		self.set_root_and_report_type()
 		self.validate_mandatory()
 		self.validate_frozen_accounts_modifier()
 		self.validate_balance_must_be_debit_or_credit()
 		self.validate_account_currency()
+		self.validate_root_company_and_sync_account_to_children()
 
 	def validate_parent(self):
 		"""Fetch Parent Details and validate parent account"""
@@ -56,7 +60,8 @@ class Account(Document):
 
 	def set_root_and_report_type(self):
 		if self.parent_account:
-			par = frappe.db.get_value("Account", self.parent_account, ["report_type", "root_type"], as_dict=1)
+			par = frappe.db.get_value("Account", self.parent_account,
+				["report_type", "root_type"], as_dict=1)
 
 			if par.report_type:
 				self.report_type = par.report_type
@@ -86,6 +91,45 @@ class Account(Document):
 		if not self.parent_account and not self.is_group:
 			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
+			frappe.throw(_("Please add the account to root level Company - %s" % ancestors[0]))
+		else:
+			descendants = get_descendants_of('Company', self.company)
+			if not descendants: return
+
+			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
+
+			for company in descendants:
+				if not parent_acc_name_map.get(company):
+					frappe.throw(_("While creating account for child Company {0}, parent account {1} not found. Please create the parent account in corresponding COA")
+						.format(company, parent_acc_name))
+
+				doc = frappe.copy_doc(self)
+				doc.flags.ignore_root_company_validation = True
+				doc.update({
+					"company": company,
+					"account_currency": None,
+					"parent_account": parent_acc_name_map[company]
+				})
+				doc.save()
+				frappe.msgprint(_("Account {0} is added in the child company {1}")
+					.format(doc.name, company))
+
 	def validate_group_or_ledger(self):
 		if self.get("__islocal"):
 			return
@@ -120,7 +164,7 @@ class Account(Document):
 
 	def validate_account_currency(self):
 		if not self.account_currency:
-			self.account_currency = frappe.db.get_value("Company", self.company, "default_currency")
+			self.account_currency = frappe.get_cached_value('Company',  self.company,  "default_currency")
 
 		elif self.account_currency != frappe.db.get_value("Account", self.name, "account_currency"):
 			if frappe.db.get_value("GL Entry", {"account": self.name}):
@@ -161,56 +205,12 @@ class Account(Document):
 		if not self.report_type:
 			throw(_("Report Type is mandatory"))
 
-
-	def update_nsm_model(self):
-		"""update lft, rgt indices for nested set model"""
-		import frappe
-		import frappe.utils.nestedset
-		frappe.utils.nestedset.update_nsm(self)
-
-	def on_update(self):
-		self.update_nsm_model()
-
-	def validate_trash(self):
-		"""checks gl entries and if child exists"""
+	def on_trash(self):
+		# checks gl entries and if child exists
 		if self.check_gle_exists():
 			throw(_("Account with existing transaction can not be deleted"))
-		if self.check_if_child_exists():
-			throw(_("Child account exists for this account. You can not delete this account."))
 
-	def on_trash(self):
-		self.validate_trash()
-		self.update_nsm_model()
-
-	def before_rename(self, old, new, merge=False):
-		# Add company abbr if not provided
-		from erpnext.setup.doctype.company.company import get_name_with_abbr
-		new_account = get_name_with_abbr(new, self.company)
-
-		# Validate properties before merging
-		if merge:
-			if not frappe.db.exists("Account", new):
-				throw(_("Account {0} does not exist").format(new))
-
-			val = list(frappe.db.get_value("Account", new_account,
-				["is_group", "root_type", "company"]))
-
-			if val != [self.is_group, self.root_type, self.company]:
-				throw(_("""Merging is only possible if following properties are same in both records. Is Group, Root Type, Company"""))
-
-			if self.is_group and frappe.db.get_value("Account", new, "parent_account") == old:
-				frappe.db.set_value("Account", new, "parent_account",
-					frappe.db.get_value("Account", old, "parent_account"))
-
-		return new_account
-
-	def after_rename(self, old, new, merge=False):
-		if not merge:
-			frappe.db.set_value("Account", new, "account_name",
-				" - ".join(new.split(" - ")[:-1]))
-		else:
-			from frappe.utils.nestedset import rebuild_tree
-			rebuild_tree("Account", "parent_account")
+		super(Account, self).on_trash(True)
 
 def get_parent_account(doctype, txt, searchfield, start, page_len, filters):
 	return frappe.db.sql("""select name from tabAccount
@@ -224,10 +224,75 @@ def get_account_currency(account):
 	if not account:
 		return
 	def generator():
-		account_currency, company = frappe.db.get_value("Account", account, ["account_currency", "company"])
+		account_currency, company = frappe.get_cached_value("Account", account, ["account_currency", "company"])
 		if not account_currency:
-			account_currency = frappe.db.get_value("Company", company, "default_currency")
+			account_currency = frappe.get_cached_value('Company',  company,  "default_currency")
 
 		return account_currency
 
 	return frappe.local_cache("account_currency", account, generator)
+
+def on_doctype_update():
+	frappe.db.add_index("Account", ["lft", "rgt"])
+
+def get_account_autoname(account_number, account_name, company):
+	# first validate if company exists
+	company = frappe.get_cached_value('Company',  company,  ["abbr", "name"], as_dict=True)
+	if not company:
+		frappe.throw(_('Company {0} does not exist').format(company))
+
+	parts = [account_name.strip(), company.abbr]
+	if cstr(account_number).strip():
+		parts.insert(0, cstr(account_number).strip())
+	return ' - '.join(parts)
+
+def validate_account_number(name, account_number, company):
+	if account_number:
+		account_with_same_number = frappe.db.get_value("Account",
+			{"account_number": account_number, "company": company, "name": ["!=", name]})
+		if account_with_same_number:
+			frappe.throw(_("Account Number {0} already used in account {1}")
+				.format(account_number, account_with_same_number))
+
+@frappe.whitelist()
+def update_account_number(name, account_name, account_number=None):
+
+	account = frappe.db.get_value("Account", name, "company", as_dict=True)
+	if not account: return
+	validate_account_number(name, account_number, account.company)
+	if account_number:
+		frappe.db.set_value("Account", name, "account_number", account_number.strip())
+	else:
+		frappe.db.set_value("Account", name, "account_number", "")
+	frappe.db.set_value("Account", name, "account_name", account_name.strip())
+
+	new_name = get_account_autoname(account_number, account_name, account.company)
+	if name != new_name:
+		frappe.rename_doc("Account", name, new_name, force=1)
+		return new_name
+
+@frappe.whitelist()
+def merge_account(old, new, is_group, root_type, company):
+	# Validate properties before merging
+	if not frappe.db.exists("Account", new):
+		throw(_("Account {0} does not exist").format(new))
+
+	val = list(frappe.db.get_value("Account", new,
+		["is_group", "root_type", "company"]))
+
+	if val != [cint(is_group), root_type, company]:
+		throw(_("""Merging is only possible if following properties are same in both records. Is Group, Root Type, Company"""))
+
+	if is_group and frappe.db.get_value("Account", new, "parent_account") == old:
+		frappe.db.set_value("Account", new, "parent_account",
+			frappe.db.get_value("Account", old, "parent_account"))
+
+	frappe.rename_doc("Account", old, new, merge=1, force=1)
+
+	return new
+
+@frappe.whitelist()
+def get_root_company(company):
+	# return the topmost company in the hierarchy
+	ancestors = get_ancestors_of('Company', company, "lft asc")
+	return [ancestors[0]] if ancestors else []

erpnext/accounts/doctype/account/account_tree.js

@@ -4,13 +4,42 @@ frappe.treeview_settings["Account"] = {
 	breadcrumbs: "Accounts",
 	title: __("Chart Of Accounts"),
 	get_tree_root: false,
-	filters: [{
-		fieldname: "company",
-		fieldtype:"Select",
-		options: $.map(locals[':Company'], function(c) { return c.name; }).sort(),
-		label: __("Company"),
-		default: frappe.defaults.get_default('company') ? frappe.defaults.get_default('company'): ""
-	}],
+	filters: [
+		{
+			fieldname: "company",
+			fieldtype:"Select",
+			options: erpnext.utils.get_tree_options("company"),
+			label: __("Company"),
+			default: erpnext.utils.get_tree_default("company"),
+			on_change: function() {
+				var me = frappe.treeview_settings['Account'].treeview;
+				var company = me.page.fields_dict.company.get_value();
+				frappe.call({
+					method: "erpnext.accounts.doctype.account.account.get_root_company",
+					args: {
+						company: company,
+					},
+					callback: function(r) {
+						if(r.message) {
+							let root_company = r.message.length ? r.message[0] : "";
+							me.page.fields_dict.root_company.set_value(root_company);
+
+							frappe.db.get_value("Company", {"name": company}, "allow_account_creation_against_child_company", (r) => {
+								frappe.flags.ignore_root_company_validation = r.allow_account_creation_against_child_company;
+							});
+						}
+					}
+				});
+			}
+		},
+		{
+			fieldname: "root_company",
+			fieldtype:"Data",
+			label: __("Root Company"),
+			hidden: true,
+			disable_onchange: true
+		}
+	],
 	root_label: "Accounts",
 	get_tree_nodes: 'erpnext.accounts.utils.get_children',
 	add_tree_node: 'erpnext.accounts.utils.add_ac',
@@ -24,15 +53,15 @@ frappe.treeview_settings["Account"] = {
 	fields: [
 		{fieldtype:'Data', fieldname:'account_name', label:__('New Account Name'), reqd:true,
 			description: __("Name of new Account. Note: Please don't create accounts for Customers and Suppliers")},
+		{fieldtype:'Data', fieldname:'account_number', label:__('Account Number'),
+			description: __("Number of new Account, it will be included in the account name as a prefix")},
 		{fieldtype:'Check', fieldname:'is_group', label:__('Is Group'),
 			description: __('Further accounts can be made under Groups, but entries can be made against non-Groups')},
 		{fieldtype:'Select', fieldname:'root_type', label:__('Root Type'),
 			options: ['Asset', 'Liability', 'Equity', 'Income', 'Expense'].join('\n'),
 			depends_on: 'eval:doc.is_group && !doc.parent_account'},
 		{fieldtype:'Select', fieldname:'account_type', label:__('Account Type'),
-			options: ['', 'Accumulated Depreciation', 'Bank', 'Cash', 'Chargeable', 'Cost of Goods Sold', 'Depreciation',
-				'Equity', 'Expense Account', 'Expenses Included In Valuation', 'Fixed Asset', 'Income Account', 'Payable', 'Receivable',
-				'Round Off', 'Stock', 'Stock Adjustment', 'Stock Received But Not Billed', 'Tax', 'Temporary'].join('\n'),
+			options: frappe.get_meta("Account").fields.filter(d => d.fieldname=='account_type')[0].options,
 			description: __("Optional. This setting will be used to filter in various transactions.")
 		},
 		{fieldtype:'Float', fieldname:'tax_rate', label:__('Tax Rate'),
@@ -41,19 +70,84 @@ frappe.treeview_settings["Account"] = {
 			description: __("Optional. Sets company's default currency, if not specified.")}
 	],
 	ignore_fields:["parent_account"],
+	onload: function(treeview) {
+		frappe.treeview_settings['Account'].treeview = {};
+		$.extend(frappe.treeview_settings['Account'].treeview, treeview);
+		function get_company() {
+			return treeview.page.fields_dict.company.get_value();
+		}
+
+		// tools
+		treeview.page.add_inner_button(__("Chart of Cost Centers"), function() {
+			frappe.set_route('Tree', 'Cost Center', {company: get_company()});
+		}, __('View'));
+
+		treeview.page.add_inner_button(__("Opening Invoice Creation Tool"), function() {
+			frappe.set_route('Form', 'Opening Invoice Creation Tool', {company: get_company()});
+		}, __('View'));
+
+		treeview.page.add_inner_button(__("Period Closing Voucher"), function() {
+			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()});
+		}, __('Make'));
+		treeview.page.add_inner_button(__("New Company"), function() {
+			frappe.new_doc('Company');
+		}, __('Make'));
+
+		// financial statements
+		for (let report of ['Trial Balance', 'General Ledger', 'Balance Sheet',
+			'Profit and Loss Statement', 'Cash Flow Statement', 'Accounts Payable', 'Accounts Receivable']) {
+			treeview.page.add_inner_button(__(report), function() {
+				frappe.set_route('query-report', report, {company: get_company()});
+			}, __('Financial Statements'));
+		}
+
+	},
+	post_render: function(treeview) {
+		frappe.treeview_settings['Account'].treeview["tree"] = treeview.tree;
+		treeview.page.set_primary_action(__("New"), function() {
+			let root_company = treeview.page.fields_dict.root_company.get_value();
+
+			if(root_company) {
+				frappe.throw(__("Please add the account to root level Company - ") + root_company);
+			} else {
+				treeview.new_node();
+			}
+		}, "octicon octicon-plus");
+	},
 	onrender: function(node) {
-		var dr_or_cr = node.data.balance < 0 ? "Cr" : "Dr";
-		if (node.data && node.data.balance!==undefined) {
-			$('<span class="balance-area pull-right text-muted small">'
-				+ (node.data.balance_in_account_currency ?
-					(format_currency(Math.abs(node.data.balance_in_account_currency),
-						node.data.account_currency) + " / ") : "")
-				+ format_currency(Math.abs(node.data.balance), node.data.company_currency)
-				+ " " + dr_or_cr
-				+ '</span>').insertBefore(node.$ul);
+		if(frappe.boot.user.can_read.indexOf("GL Entry") !== -1){
+			var dr_or_cr = in_list(["Liability", "Income", "Equity"], node.data.root_type) ? "Cr" : "Dr";
+			if (node.data && node.data.balance!==undefined) {
+				$('<span class="balance-area pull-right text-muted small">'
+					+ (node.data.balance_in_account_currency ?
+						(format_currency(Math.abs(node.data.balance_in_account_currency),
+							node.data.account_currency) + " / ") : "")
+					+ format_currency(Math.abs(node.data.balance), node.data.company_currency)
+					+ " " + dr_or_cr
+					+ '</span>').insertBefore(node.$ul);
+			}
 		}
 	},
 	toolbar: [
+		{
+			label:__("Add Child"),
+			condition: function(node) {
+				return frappe.boot.user.can_create.indexOf("Account") !== -1
+					&& (!frappe.treeview_settings['Account'].treeview.page.fields_dict.root_company.get_value()
+					|| frappe.flags.ignore_root_company_validation)
+					&& node.expandable && !node.hide_add;
+			},
+			click: function() {
+				var me = frappe.treeview_settings['Account'].treeview;
+				me.new_node();
+			},
+			btnClass: "hidden-xs"
+		},
 		{
 			condition: function(node) {
 				return !node.root && frappe.boot.user.can_read.indexOf("GL Entry") !== -1
@@ -64,7 +158,7 @@ frappe.treeview_settings["Account"] = {
 					"account": node.label,
 					"from_date": frappe.sys_defaults.year_start_date,
 					"to_date": frappe.sys_defaults.year_end_date,
-					"company": frappe.defaults.get_default('company') ? frappe.defaults.get_default('company'): ""
+					"company": frappe.treeview_settings['Account'].treeview.page.fields_dict.company.get_value()
 				};
 				frappe.set_route("query-report", "General Ledger");
 			},

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

@@ -1,10 +1,13 @@
 # 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, os, json
 from frappe.utils import cstr
 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):
 	chart = get_chart(chart_template, existing_company)
@@ -12,16 +15,16 @@ def create_charts(company, chart_template=None, existing_company=None):
 		accounts = []
 
 		def _import_accounts(children, parent, root_type, root_account=False):
-			for account_name, child in children.items():
+			for account_name, child in iteritems(children):
 				if root_account:
 					root_type = child.get("root_type")
 
-				if account_name not in ["account_type", "root_type", "is_group", "tax_rate"]:
+				if account_name not in ["account_number", "account_type",
+					"root_type", "is_group", "tax_rate"]:
 
-					account_name_in_db = unidecode(account_name.strip().lower())
-					if account_name_in_db in accounts:
-						count = accounts.count(account_name_in_db)
-						account_name = account_name + " " + cstr(count)
+					account_number = cstr(child.get("account_number")).strip()
+					account_name, account_name_in_db = add_suffix_if_duplicate(account_name,
+						account_number, accounts)
 
 					is_group = identify_is_group(child)
 					report_type = "Balance Sheet" if root_type in ["Asset", "Liability", "Equity"] \
@@ -35,28 +38,47 @@ def create_charts(company, chart_template=None, existing_company=None):
 						"is_group": is_group,
 						"root_type": root_type,
 						"report_type": report_type,
+						"account_number": account_number,
 						"account_type": child.get("account_type"),
-						"account_currency": frappe.db.get_value("Company", company, "default_currency"),
+						"account_currency": frappe.db.get_value('Company',  company,  "default_currency"),
 						"tax_rate": child.get("tax_rate")
 					})
 
 					if root_account or frappe.local.flags.allow_unverified_charts:
 						account.flags.ignore_mandatory = True
-						
+
 					account.flags.ignore_permissions = True
-					
+
 					account.insert()
 
 					accounts.append(account_name_in_db)
 
 					_import_accounts(child, account.name, root_type)
 
+		# Rebuild NestedSet HSM tree for Account Doctype
+		# after all accounts are already inserted.
+		frappe.local.flags.ignore_on_update = True
 		_import_accounts(chart, None, None, root_account=True)
+		rebuild_tree("Account", "parent_account")
+		frappe.local.flags.ignore_on_update = False
+
+def add_suffix_if_duplicate(account_name, account_number, accounts):
+	if account_number:
+		account_name_in_db = unidecode(" - ".join([account_number,
+			account_name.strip().lower()]))
+	else:
+		account_name_in_db = unidecode(account_name.strip().lower())
+
+	if account_name_in_db in accounts:
+		count = accounts.count(account_name_in_db)
+		account_name = account_name + " " + cstr(count)
+
+	return account_name, account_name_in_db
 
 def identify_is_group(child):
 	if child.get("is_group"):
 		is_group = child.get("is_group")
-	elif len(set(child.keys()) - set(["account_type", "root_type", "is_group", "tax_rate"])):
+	elif len(set(child.keys()) - set(["account_type", "root_type", "is_group", "tax_rate", "account_number"])):
 		is_group = 1
 	else:
 		is_group = 0
@@ -67,10 +89,14 @@ def get_chart(chart_template, existing_company=None):
 	chart = {}
 	if existing_company:
 		return get_account_tree_from_existing_company(existing_company)
-	
+
 	elif chart_template == "Standard":
 		from erpnext.accounts.doctype.account.chart_of_accounts.verified import standard_chart_of_accounts
 		return standard_chart_of_accounts.get()
+	elif chart_template == "Standard with Numbers":
+		from erpnext.accounts.doctype.account.chart_of_accounts.verified \
+			import standard_chart_of_accounts_with_account_number
+		return standard_chart_of_accounts_with_account_number.get()
 	else:
 		folders = ("verified",)
 		if frappe.local.flags.allow_unverified_charts:
@@ -86,7 +112,7 @@ def get_chart(chart_template, existing_company=None):
 							return json.loads(chart).get("tree")
 
 @frappe.whitelist()
-def get_charts_for_country(country):
+def get_charts_for_country(country, with_standard=False):
 	charts = []
 
 	def _get_chart_name(content):
@@ -104,6 +130,8 @@ def get_charts_for_country(country):
 
 		for folder in folders:
 			path = os.path.join(os.path.dirname(__file__), folder)
+			if not os.path.exists(path):
+				continue
 
 			for fname in os.listdir(path):
 				fname = frappe.as_unicode(fname)
@@ -111,51 +139,96 @@ def get_charts_for_country(country):
 					with open(os.path.join(path, fname), "r") as f:
 						_get_chart_name(f.read())
 
-	if len(charts) != 1:
-		charts.append("Standard")
+	# if more than one charts, returned then add the standard
+	if len(charts) != 1 or with_standard:
+		charts += ["Standard", "Standard with Numbers"]
 
 	return charts
 
 
 def get_account_tree_from_existing_company(existing_company):
-	all_accounts = frappe.get_all('Account', 
-		filters={'company': existing_company}, 
-		fields = ["name", "account_name", "parent_account", "account_type", 
-			"is_group", "root_type", "tax_rate"], 
+	all_accounts = frappe.get_all('Account',
+		filters={'company': existing_company},
+		fields = ["name", "account_name", "parent_account", "account_type",
+			"is_group", "root_type", "tax_rate", "account_number"],
 		order_by="lft, rgt")
-	
+
 	account_tree = {}
 
 	# fill in tree starting with root accounts (those with no parent)
 	if all_accounts:
 		build_account_tree(account_tree, None, all_accounts)
 	return account_tree
-	
+
 def build_account_tree(tree, parent, all_accounts):
 	# find children
 	parent_account = parent.name if parent else ""
 	children = [acc for acc in all_accounts if cstr(acc.parent_account) == parent_account]
-			
+
 	# if no children, but a group account
 	if not children and parent.is_group:
 		tree["is_group"] = 1
+		tree["account_number"] = parent.account_number
 
 	# build a subtree for each child
 	for child in children:
-		if child.account_type == "Stock" and not child.is_group:
-			tree["is_group"] = 1
-			continue
-		
 		# start new subtree
 		tree[child.account_name] = {}
-		
+
 		# assign account_type and root_type
+		if child.account_number:
+			tree[child.account_name]["account_number"] = child.account_number
 		if child.account_type:
 			tree[child.account_name]["account_type"] = child.account_type
 		if child.tax_rate:
 			tree[child.account_name]["tax_rate"] = child.tax_rate
 		if not parent:
 			tree[child.account_name]["root_type"] = child.root_type
-			
+
 		# call recursively to build a subtree for current account
-		build_account_tree(tree[child.account_name], child, all_accounts)
+		build_account_tree(tree[child.account_name], child, all_accounts)
+
+@frappe.whitelist()
+def validate_bank_account(coa, bank_account):
+	accounts = []
+	chart = get_chart(coa)
+
+	if chart:
+		def _get_account_names(account_master):
+			for account_name, child in iteritems(account_master):
+				if account_name not in ["account_number", "account_type",
+					"root_type", "is_group", "tax_rate"]:
+					accounts.append(account_name)
+
+					_get_account_names(child)
+
+		_get_account_names(chart)
+
+	return (bank_account in accounts)
+
+@frappe.whitelist()
+def build_tree_from_json(chart_template):
+	''' get chart template from its folder and parse the json to be rendered as tree '''
+	chart = get_chart(chart_template)
+
+	# if no template selected, return as it is
+	if not chart:
+		return
+
+	accounts = []
+	def _import_accounts(children, parent):
+		''' recursively called to form a parent-child based list of dict from chart template '''
+		for account_name, child in iteritems(children):
+			account = {}
+			if account_name in ["account_number", "account_type",\
+				"root_type", "is_group", "tax_rate"]: continue
+
+			account['parent_account'] = parent
+			account['expandable'] = True if identify_is_group(child) else False
+			account['value'] = (child.get('account_number') + ' - ' + account_name) \
+				if child.get('account_number') else account_name
+			accounts.append(account)
+			_import_accounts(child, account['value'])
+
+	_import_accounts(chart, None)
+	return accounts

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

@@ -12,6 +12,8 @@ from xml.etree import ElementTree as ET
 from frappe.utils.csvutils import read_csv_content
 import frappe
 
+from six import iteritems
+
 path = "/Users/nabinhait/projects/odoo/addons"
 
 accounts = {}
@@ -137,7 +139,7 @@ def get_account_types(root_list, csv_content, prefix=None):
 
 def make_maps_for_xml(xml_roots, account_types, country_dir):
 	"""make maps for `charts` and `accounts`"""
-	for model, root_list in xml_roots.iteritems():
+	for model, root_list in iteritems(xml_roots):
 		for root in root_list:
 			for node in root[0].findall("record"):
 				if node.get("model")=="account.account.template":

erpnext/accounts/doctype/account/chart_of_accounts/unverified/ar_ar_chart_template.json

@@ -1,209 +0,0 @@
-{
-    "country_code": "ar",
-    "name": "Argentina - Plan de Cuentas",
-    "tree": {
-        "Cuentas Patrimoniales": {
-            "ACTIVO": {
-                "Bienes Inmateriales": {
-                    "Bienes Inmateriales / (-) Amortizaci\u00f3n Acumulada": {},
-                    "Bienes Inmateriales / Concesiones y Franquicias": {},
-                    "Bienes Inmateriales / Marcas de F\u00e1brica": {},
-                    "Bienes Inmateriales / Patentes de Invenci\u00f3n": {}
-                },
-                "Bienes de Cambio": {
-                    "(-) Previsi\u00f3n para Desvalorizaci\u00f3n de Bienes de Cambio": {},
-                    "Bienes de Cambio - Mercader\u00edas": {
-                        "Bienes de Cambio - Mercader\u00edas / Categoria de productos 01": {}
-                    },
-                    "Bienes de Cambio - Mercader\u00edas en Tr\u00e1nsito": {},
-                    "Materiales Varios ": {},
-                    "Materias primas": {},
-                    "Productos Elaborados": {},
-                    "Productos en Curso de Elaboraci\u00f3n": {}
-                },
-                "Bienes de Uso": {
-                    "Bienes de Uso / (-) Depreciaci\u00f3n Acumulada": {},
-                    "Bienes de Uso / Equipos": {},
-                    "Bienes de Uso / Inmuebles": {},
-                    "Bienes de Uso / Maquinaria": {},
-                    "Bienes de Uso / Rodados": {}
-                },
-                "Caja y Bancos": {
-                    "Caja y Bancos - Caja": {
-                        "Caja y bancos - Caja / efectivo ARS": {}
-                    },
-                    "Caja y Bancos - Cuentas Corrientes": {
-                        "Caja y Bancos.../ BCO. CTA CTE ARS": {}
-                    },
-                    "Caja y Bancos - Fondos fijos": {
-                        "Caja y ...- Fondos fijos / caja chica 01 ARS": {}
-                    },
-                    "Caja y Bancos - Moneda Extranjera": {
-                        "Caja y bancos - Caja / efectivo USD": {}
-                    },
-                    "Caja y bancos - Recaudaciones a Depositar ": {},
-                    "Caja y bancos - Valores a Depositar ": {}
-                },
-                "Inversiones": {
-                    "Inversiones / (-) Previsi\u00f3n para Devalorizaci\u00f3n de Acciones": {},
-                    "Inversiones / Acciones Permanentes": {},
-                    "Inversiones / Acciones Transitorias": {},
-                    "Inversiones / T\u00edtulos P\u00fablicos": {}
-                }
-            },
-            "Cr\u00e9ditos por Ventas": {
-                "Cr\u00e9ditos por Ventas / (-) Previsi\u00f3n para Ds. Incobrables": {},
-                "Cr\u00e9ditos por Ventas / Deudores Morosos": {},
-                "Cr\u00e9ditos por Ventas / Deudores Varios": {},
-                "Cr\u00e9ditos por Ventas / Deudores en Gesti\u00f3n Judicial": {},
-                "Cr\u00e9ditos por Ventas / Deudores por Ventas": {}
-            },
-            "Otros Cr\u00e9ditos": {
-                "Otros Cr\u00e9ditos / (-) Intereses (+) a Devengar": {},
-                "Otros Cr\u00e9ditos / (-) Previsi\u00f3n para Descuentos": {},
-                "Otros Cr\u00e9ditos / Accionistas": {},
-                "Otros Cr\u00e9ditos / Alquileres Pagados por Adelantado": {},
-                "Otros Cr\u00e9ditos / Anticipo al Personal": {},
-                "Otros Cr\u00e9ditos / Anticipo de Impuestos": {},
-                "Otros Cr\u00e9ditos / Anticipos a Proveedores": {},
-                "Otros Cr\u00e9ditos / Intereses Pagados por Adelantado": {},
-                "Otros Cr\u00e9ditos / Pr\u00e9stamos otorgados": {}
-            },
-            "PASIVO": {
-                "Deudas Bancarias y Financieras": {
-                    "Deudas Bancarias y Financieras / Adelantos en Cuenta Corriente": {},
-                    "Deudas Bancarias y Financieras / Debentures Emitidos": {},
-                    "Deudas Bancarias y Financieras / Intereses a Pagar": {},
-                    "Deudas Bancarias y Financieras / Obligaciones a Pagar": {},
-                    "Deudas Bancarias y Financieras / Prestamos": {}
-                },
-                "Deudas Comerciales": {
-                    "Deudas Comerciales / (-) Intereses a Devengar por Compras al Cr\u00e9dito": {},
-                    "Deudas Comerciales / Anticipos de Clientes": {},
-                    "Deudas Comerciales / Proveedores": {}
-                },
-                "Deudas Fiscales": {
-                    "Deudas Fiscales / IVA a Pagar": {},
-                    "Deudas Fiscales / Impuesto a la Ganancia M\u00ednima Presunta a Pagar": {},
-                    "Deudas Fiscales / Impuesto a las Ganancias a Pagar": {},
-                    "Deudas Fiscales / Impuesto a los D\u00e9bitos y Cr\u00e9ditos Bancarios a Pagar": {},
-                    "Deudas Fiscales / Impuesto sobre los Bienes Personales a Pagar": {},
-                    "Deudas Fiscales / Monotributo a Pagar": {}
-                },
-                "Deudas Sociales": {
-                    "Deudas Sociales / Cargas Sociales a Pagar": {},
-                    "Deudas Sociales / Provisi\u00f3n para Sueldo Anual Complementario": {},
-                    "Deudas Sociales / Retenciones a Depositar": {},
-                    "Deudas Sociales / Sueldos a Pagar": {}
-                },
-                "Otras Deudas": {
-                    "Otras Deudas / Acreedores Varios": {},
-                    "Otras Deudas / Cobros por Adelantado": {},
-                    "Otras Deudas / Dividendos a Pagar": {},
-                    "Otras Deudas / Honorarios Directores y S\u00edndicos a Pagar": {}
-                },
-                "Previsiones": {
-                    "Previsiones / Previsi\u00f3n Indemnizaci\u00f3n por Despidos": {},
-                    "Previsiones / Previsi\u00f3n para Garant\u00edas por Service": {},
-                    "Previsiones / Previsi\u00f3n para juicios Pendientes": {}
-                }
-            },
-            "PATRIMONIO NETO": {
-                "Ajustes al Patrimonio": {
-                    "Ajustes al Patrimonio / Revaluo T\u00e9cnico de Bienes de Uso": {}
-                },
-                "Aportes No Capitalizados": {
-                    "Aportes No Capitalizados / Aportes Irrevocables Futura Suscripci\u00f3n de Acciones": {},
-                    "Aportes No Capitalizados / Primas de Emsi\u00f3n": {}
-                },
-                "Capital Social": {
-                    "Capital social / (-) Descuento de Emisi\u00f3n de Acciones": {},
-                    "Capital social / Acciones en Circulaci\u00f3n": {},
-                    "Capital social / Capital Suscripto": {},
-                    "Capital social / Dividendos a Distribuir en Acciones": {}
-                },
-                "Ganancias Reservadas": {
-                    "Reserva Estatutaria": {},
-                    "Reserva Facultativa": {},
-                    "Reserva Legal": {},
-                    "Reserva para Renovaci\u00f3n de Bienes de Uso": {}
-                },
-                "Resultados No Asignados": {
-                    "Ganancias y P\u00e9rdidas del Ejercicio": {},
-                    "Resultado del Ejercicio": {},
-                    "Resultados Acumulados": {},
-                    "Resultados Acumulados del Ejercicio Anterior": {}
-                }
-            },
-            "root_type": ""
-        },
-        "Cuentas de Movimiento": {
-            "Compras": {
-                "Compras - Categoria de productos 01": {}
-            },
-            "Costos de Producci\u00f3n": {},
-            "Gastos de Administraci\u00f3n": {},
-            "Gastos de Comercializaci\u00f3n": {},
-            "root_type": ""
-        },
-        "Cuentas de Orden": {
-            "CUENTAS DE ORDEN ACREEDORAS": {
-                "Acreedor por Documentos Descontados": {},
-                "Acreedor por Garant\u00edas Otorgadas": {},
-                "Comitente por Mercaderias Recibidas en Consignaci\u00f3n": {}
-            },
-            "CUENTAS DE ORDEN DEUDORAS": {
-                "Dep\u00f3sito de Valores Recibos en Garant\u00eda": {},
-                "Documentos Descontados": {},
-                "Documentos Endosados": {},
-                "Garantias Otorgadas": {},
-                "Mercaderias Recibidas en Consignaci\u00f3n": {}
-            },
-            "root_type": ""
-        },
-        "Cuentas de Resultado": {
-            "RESULTADOS NEGATIVOS": {
-                "Resultados Negativos Extraordinarios": {
-                    "Donaciones Cedidas, Otorgadas": {},
-                    "Gastos en Siniestros": {},
-                    "P\u00e9rdida Venta Bienes de Uso": {}
-                },
-                "Resultados Negativos Ordinarios": {
-                    "Costo de Mercader\u00edas Vendidas": {
-                        "Costo de Mercader\u00edas Vendidas - Categoria de productos 01": {}
-                    },
-                    "Gastos Bancarios": {},
-                    "Gastos de Publicidad y Propaganda": {},
-                    "Gastos en Amortizaci\u00f3n": {},
-                    "Gastos en Cargas Sociales": {},
-                    "Gastos en Depreciaci\u00f3n de Bienes de Uso": {},
-                    "Gastos en Impuestos": {},
-                    "Gastos en Servicios P\u00fablicos": {},
-                    "Gastos en Sueldos y Jormales": {}
-                }
-            },
-            "RESULTADOS POSITIVOS": {
-                "Resultados Positivos Extraordinarios": {
-                    "Donaciones obtenidas, ganandas, percibidas": {},
-                    "Ganancia Venta Inversiones Permanentes": {},
-                    "Ganancia Venta de Bienes de Uso": {},
-                    "Recupero de Deudores Incobrables": {},
-                    "Recupero de Rezagos": {}
-                },
-                "Resultados Positivos Ordinarios": {
-                    "Alquileres gananados, obtenidos, percibidos": {},
-                    "Comisiones gananados, obtenidos, percibidos": {},
-                    "Descuentos gananados, obtenidos, percibidos": {},
-                    "Ganancia Venta de Acciones": {},
-                    "Honorarios gananados, obtenidos, percibidos": {},
-                    "Intereses gananados, obtenidos, percibidos": {},
-                    "Renta de T\u00edtulos P\u00fablicos": {},
-                    "Resultados Positivos Ordinarios": {
-                        "Ventas - Categoria de productos 01": {}
-                    }
-                }
-            },
-            "root_type": ""
-        }
-    }
-}

erpnext/accounts/doctype/account/chart_of_accounts/unverified/ca_ca_en_chart_template_en.json

@@ -1,172 +0,0 @@
-{
-    "country_code": "ca",
-    "name": "Canada - Chart of Accounts for english-speaking provinces",
-    "tree": {
-        "ASSETS": {
-            "CURRENT ASSETS": {
-                "ACCOUNTS RECEIVABLES": {
-                    "ALLOWANCE FOR DOUBTFUL ACCOUNTS": {},
-                    "Customers Account": {
-                        "account_type": "Receivable"
-                    }
-                },
-                "CASH": {},
-                "CERTIFICATES OF DEPOSITS": {},
-                "INVESTMENTS HELD FOR TRADING": {},
-                "PREPAID EXPENSES": {},
-                "STOCKS": {
-                    "Stock Delivered But Not Billed": {},
-                    "Stock In Hand": {}
-                },
-                "TAXES RECEIVABLES": {
-                    "GST receivable": {
-                        "account_type": "Receivable"
-                    },
-                    "HST receivable": {
-                        "HST receivable - 13%": {
-                            "account_type": "Receivable"
-                        },
-                        "HST receivable - 14%": {
-                            "account_type": "Receivable"
-                        },
-                        "HST receivable - 15%": {
-                            "account_type": "Receivable"
-                        }
-                    },
-                    "PST/QST receivable": {
-                        "account_type": "Receivable"
-                    }
-                },
-                "TREASURY OR TREASURY EQUIVALENTS": {}
-            },
-            "NON-CURRENT ASSETS": {
-                "INTANGIBLE ASSETS": {
-                    "PATENTS, TRADEMARKS AND COPYRIGHTS": {}
-                },
-                "INVESTMENTS AVAILABLE FOR SALE": {},
-                "TANGIBLE ASSETS": {
-                    "ACCUMULATED DEPRECIATIONS": {}
-                }
-            },
-            "root_type": "Asset"
-        },
-        "EQUITY": {
-            "CONTRIBUTED SURPLUS": {},
-            "DIVIDENDS": {},
-            "PREMIUMS": {},
-            "RETAINED EARNINGS": {},
-            "SHARE CAPITAL": {},
-            "TRANSLATION ADJUSTMENTS": {},
-            "root_type": "Equity"
-        },
-        "EXPENSES": {
-            "NON-OPERATING EXPENSES": {
-                "INTERESTS EXPENSES": {},
-                "OTHER NON-OPERATING EXPENSES": {}
-            },
-            "OPERATING EXPENSES": {
-                "COST OF GOODS SOLD": {
-                    "Inside Purchases": {},
-                    "International Purchases": {},
-                    "Purchases in harmonized provinces": {},
-                    "Purchases in non-harmonized provinces": {}
-                },
-                "GENERAL EXPENSES": {},
-                "LABOUR EXPENSES": {
-                    "Annuities": {},
-                    "Employment Insurance": {},
-                    "Federal Income Tax": {},
-                    "Health Services Fund": {},
-                    "Holidays": {},
-                    "Labour Health and Safety": {},
-                    "Labour Standards": {},
-                    "Parental Insurance": {},
-                    "Provincial Income Tax": {},
-                    "Salaries, wages and commissions": {}
-                },
-                "OTHER OPERATING EXPENSES": {},
-                "RESEARCH AND DEVELOPMENT EXPENSES": {},
-                "SALES EXPENSES": {}
-            },
-            "root_type": "Expense"
-        },
-        "INCOMES": {
-            "NON-OPERATING INCOMES": {
-                "INTERESTS": {},
-                "OTHER NON-OPERATING INCOMES": {}
-            },
-            "OPERATING INCOMES": {
-                "Harmonized Provinces Sales": {},
-                "Inside Sales": {},
-                "International Sales": {},
-                "Non-Harmonized Provinces Sales": {},
-                "OTHER OPERATING INCOMES": {}
-            },
-            "root_type": "Income"
-        },
-        "LIABILITIES": {
-            "CURRENT LIABILITIES": {
-                "ACCOUNTS PAYABLES": {
-                    "Suppliers Account": {
-                        "account_type": "Payable"
-                    }
-                },
-                "CURRENT FINANCIAL DEBTS": {},
-                "LABOUR TAXES TO PAY": {
-                    "CANADIAN REVENU AGENCY": {
-                        "EMPLOYMENT INSURANCE TO PAY": {
-                            "EI - Employees Contribution": {},
-                            "EI - Employer Contribution": {}
-                        },
-                        "Federal Income Tax": {}
-                    },
-                    "PROVINCIAL REVENU AGENCY": {
-                        "ANNUITIES TO PAY": {
-                            "Annuities - Employees Contribution": {},
-                            "Annuities - Employer Contribution": {}
-                        },
-                        "Health Services Fund to pay": {},
-                        "Labour Health and Safety to pay": {},
-                        "Labour Standards to pay": {},
-                        "PARENTAL INSURANCE PLAN TO PAY": {
-                            "PAP - Employee Contribution": {},
-                            "PAP - Employer Contribution": {}
-                        },
-                        "Provincial Income Tax": {}
-                    }
-                },
-                "LIABILITIES ASSETS HELD FOR TRANSFER": {
-                    "Stock Received But Not Billed": {}
-                },
-                "OTHER ACCOUNTS PAYABLES": {},
-                "STOCK LIABILITIES": {},
-                "TAXES PAYABLES": {
-                    "GST to pay": {
-                        "account_type": "Payable"
-                    },
-                    "HST to pay": {
-                        "HST to pay - 13%": {
-                            "account_type": "Payable"
-                        },
-                        "HST to pay - 14%": {
-                            "account_type": "Payable"
-                        },
-                        "HST to pay - 15%": {
-                            "account_type": "Payable"
-                        }
-                    },
-                    "PST/QST to pay": {
-                        "account_type": "Payable"
-                    }
-                }
-            },
-            "NON-CURRENT LIABILITIES": {
-                "DEFERRED TAXES": {},
-                "NON-CURRENT FINANCIAL DEBTS": {},
-                "OTHER NON-CURRENT LIABILITIES": {},
-                "PROVISIONS FOR PENSIONS AND OTHER POST-EMPLOYMENT ADVANTAGES": {}
-            },
-            "root_type": "Liability"
-        }
-    }
-}

erpnext/accounts/doctype/account/chart_of_accounts/unverified/hu_hungarian_chart_template.json

@@ -1,355 +0,0 @@
-{
-    "country_code": "hu", 
-    "name": "Hungary - Magyar f\u0151k\u00f6nyvi kivonat", 
-    "tree": {
-        "Eredm\u00e9ny sz\u00e1ml\u00e1k": {
-            "AZ \u00c9RT\u00c9KES\u00cdT\u00c9S \u00c1RBEV\u00c9TELE, BEV\u00c9TELEK": {
-                "BELF\u00d6LDI \u00c9RK\u00c9KES\u00cdT\u00c9S \u00c1RBEV\u00c9TELE": {
-                    "Belf\u00f6ldi \u00e9rt\u00e9kes\u00edt\u00e9s \u00e1rbev\u00e9tele": {}
-                }, 
-                "BELF\u00d6LDI \u00c9RT\u00c9KES\u00cdT\u00c9S \u00c1RBEV\u00c9TELE": {
-                    "Belf\u00f6ldi \u00e9rt\u00e9kes\u00edt\u00e9s \u00e1rbev\u00e9tele": {}
-                }, 
-                "EGY\u00c9B BEV\u00c9TELEK": {
-                    "Az \u00fczleti \u00e9vhez kapcs. egy\u00e9b bev\u00e9telek": {}, 
-                    "Biztos\u00edt\u00f3 \u00e1ltal visszaig. k\u00e1rt\u00e9r\u00edt\u00e9s \u00f6.": {}, 
-                    "C\u00e9ltartal\u00e9k felhaszn\u00e1l\u00e1sa": {}, 
-                    "K\u00fcl\u00f6nf\u00e9le egy\u00e9b bev\u00e9telek": {}, 
-                    "Ut\u00f3lag kapott p\u00fc. rendezett engedm\u00e9ny": {}, 
-                    "Visszafiz. k\u00f6t. n\u00e9lk\u00fcl kapott t\u00e1mogat\u00e1s": {}, 
-                    "\u00c9rt,\u00e1truh\u00e1zott k\u00f6vetel\u00e9sek elism.m\u00e9rt\u00e9ke": {}, 
-                    "\u00c9rt.immat. javak, t\u00e1rgyi eszk.bev\u00e9tele": {}, 
-                    "\u00c9rt\u00e9kveszt\u00e9sek vissza\u00edr\u00e1sa, tervenf.\u00e9cs.": {}
-                }, 
-                "EXPORT \u00c9RT\u00c9KES\u00cdT\u00c9S \u00c1RBEV\u00c9TELE": {
-                    "Export \u00e9rt\u00e9kes\u00edt\u00e9s \u00e1rbev. EU tagorsz\u00e1gba": {}, 
-                    "Export \u00e9rt\u00e9kes\u00edt\u00e9s \u00e1rbev.nem EU tagorsz.": {}
-                }, 
-                "P\u00c9NZ\u00dcGYI M\u00dcVELETEK BEV\u00c9TELEI": {
-                    "Befekt. p\u00fci.eszk. kamatai, \u00e1rf.nyeres.": {}, 
-                    "Egy\u00e9b kapott kamatok,kamatjell.bev\u00e9telek": {}, 
-                    "Egy\u00e9b p\u00e9nz\u00fcgyi m\u00fbveletek bev\u00e9telei": {}, 
-                    "Egy\u00e9b \u00e1rfolyamnyeres\u00e9gek, opci\u00f3s bev.": {}, 
-                    "Forg\u00f3eszk. \u00e9rt\u00e9kpap\u00edr \u00e1rfolyamnyeres\u00e9ge": {}, 
-                    "Kapott (j\u00e1r\u00f3) osztal\u00e9k, r\u00e9szesed\u00e9s": {}, 
-                    "R\u00e9szesed\u00e9sek \u00e9rt. \u00e1rfolyamnyeres\u00e9ge": {}, 
-                    "V\u00e1s. k\u00f6vetel\u00e9sekkel kapcs. bev\u00e9telek": {}, 
-                    "\u00c1tv\u00e1lt\u00e1si, \u00e1t\u00e9rt\u00e9kel\u00e9skori \u00e1rf.nyeres\u00e9g": {}
-                }, 
-                "RENDKIV\u00dcLI BEV\u00c9TELEK": {
-                    "Rendk\u00edv\u00fcli bev\u00e9telek": {}
-                }
-            }, 
-            "AZ \u00c9RT\u00c9KES\u00cdT\u00c9S \u00d6NK\u00d6LTS. \u00c9S R\u00c1FORD\u00cdT\u00c1SOK": {
-                "ANYAGJELLEG\u00db R\u00c1FORD\u00cdT\u00c1SOK": {
-                    "Anyagk\u00f6lts\u00e9g": {}, 
-                    "Egy\u00e9b szolg\u00e1ltat\u00e1sok \u00e9rt\u00e9ke": {}, 
-                    "Eladott (k\u00f6zvet\u00edtett) szolg. \u00e9rt\u00e9ke": {}, 
-                    "Eladott \u00e1ruk beszerz\u00e9si \u00e9rt\u00e9ke": {}, 
-                    "Ig\u00e9nybevett szolg\u00e1ltat\u00e1sok \u00e9rt\u00e9ke": {}
-                }, 
-                "EGY\u00c9B R\u00c1FORD\u00cdT\u00c1SOK": {
-                    "Ad\u00f3k, illet\u00e9kek, hozz\u00e1j\u00e1rul\u00e1sok": {}, 
-                    "Az \u00fczleti \u00e9vhez kapcs. r\u00e1ford\u00edt\u00e1sok": {}, 
-                    "C\u00e9ltartal\u00e9k k\u00e9pz\u00e9se": {}, 
-                    "Elsz\u00e1molt \u00e9rt\u00e9kveszt\u00e9s, tervenf. \u00e9rt\u00e9kcs": {}, 
-                    "K\u00fcl\u00f6nf\u00e9le egy\u00e9b r\u00e1ford\u00edt\u00e1sok": {}, 
-                    "Ut\u00f3lag adott p\u00fc. rendezett engedm\u00e9ny": {}, 
-                    "\u00c9rt.\u00e1truh\u00e1zott k\u00f6vetel\u00e9sek k\u00f6nyvsz. \u00e9rt.": {}, 
-                    "\u00c9rt\u00e9kes\u00edtett eszk.imm.javak nytsz \u00e9rt\u00e9ke": {}
-                }, 
-                "NYERES\u00c9GET TERHEL\u00d6 AD\u00d3K": {
-                    "Egyszer\u00fcs\u00edtett v\u00e1llalkoz\u00f3i ad\u00f3": {}, 
-                    "T\u00e1rsas v\u00e1llalkoz\u00e1s k\u00fcl\u00f6nad\u00f3ja": {}, 
-                    "T\u00e1rsas\u00e1gi ad\u00f3": {}
-                }, 
-                "P\u00c9NZ\u00dcGYI M\u00dcVELETEK R\u00c1FORD\u00cdT\u00c1SAI": {
-                    "Befektetett p\u00fci. eszk. \u00e1rf.vesztes\u00e9ge": {}, 
-                    "Egy\u00e9b p\u00e9nz\u00fcgyi r\u00e1ford\u00edt\u00e1sok": {}, 
-                    "Egy\u00e9b \u00e1rfolyamvesztes\u00e9gek, opci\u00f3s d\u00edjak": {}, 
-                    "Fizetend\u00f5 kamatok, kamatjell. r\u00e1ford.": {}, 
-                    "Forg\u00f3eszk. \u00e9rt\u00e9kpap\u00edr \u00e1rf.vesztes\u00e9ge": {}, 
-                    "R\u00e9szesed\u00e9sek,\u00e9.pap\u00edrok,bankb. \u00e9rt\u00e9kveszt": {}, 
-                    "V\u00e1s\u00e1rolt k\u00f6v. kapcs. r\u00e1ford\u00edt\u00e1sok": {}, 
-                    "\u00c1tv\u00e1lt\u00e1si, \u00e9rt\u00e9kel\u00e9si \u00e1rfolyamvesztes\u00e9g": {}
-                }, 
-                "RENDKIV\u00dcLI R\u00c1FORD\u00cdT\u00c1SOK": {
-                    "Egy\u00e9b vagyoncs\u00f6kk. rendk\u00edv\u00fcli r\u00e1ford\u00edt\u00e1s": {}, 
-                    "Saj\u00e1t \u00fczletr\u00e9sz nyilv\u00e1ntart\u00e1si \u00e9rt\u00e9ke": {}, 
-                    "Tartoz\u00e1s\u00e1tv. szerz. szerinti \u00f6sszege": {}, 
-                    "T\u00e1rsas\u00e1gban bevitt eszk. nytsz. \u00e9rt\u00e9ke": {}
-                }, 
-                "SZEM\u00c9LYI JELLEG\u00fb R\u00c1FORD\u00cdT\u00c1SOK": {
-                    "B\u00e9rj\u00e1rul\u00e9kok": {}, 
-                    "B\u00e9rk\u00f6lts\u00e9g": {}, 
-                    "Szem\u00e9lyi jelleg\u00fc egy\u00e9b kifizet\u00e9sek": {}
-                }, 
-                "\u00c9RT\u00c9KCS\u00d6KKEN\u00c9SI LE\u00cdR\u00c1S": {}
-            }, 
-            "K\u00d6LTS\u00c9GNEMEK": {
-                "AKT\u00cdV\u00c1LT SAJ\u00c1T TELJES\u00cdTM\u00c9NYEK \u00c9RT\u00c9KE": {
-                    "Saj\u00e1t el\u00f5\u00e1ll\u00edt\u00e1si eszk\u00f6z\u00f6k aktiv\u00e1lt \u00e9rt.": {}, 
-                    "Saj\u00e1t term. k\u00e9szletek \u00e1llom\u00e1nyv\u00e1ltoz\u00e1sa": {}
-                }, 
-                "ANYAGK\u00d6LTS\u00c9G": {
-                    "Anyagk\u00f6lts\u00e9g megt\u00e9r\u00fcl\u00e9s": {}, 
-                    "Egy \u00e9ven bel\u00fcl elhaszn. anyagi eszk\u00f6z\u00f6k": {}, 
-                    "Egy\u00e9b anyagk\u00f6lts\u00e9g": {}, 
-                    "V\u00e1s\u00e1rolt anyagok k\u00f6lts\u00e9gei": {}
-                }, 
-                "B\u00c9RJ\u00c1RUL\u00c9KOK": {
-                    "Egyszer\u00fbs\u00edtett fogl. k\u00f6zteher": {}, 
-                    "Egyszer\u00fbs\u00edtett k\u00f6ztehervisel\u00e9si hj\u00e1r": {}, 
-                    "Eg\u00e9szs\u00e9g\u00fcgyi hozz\u00e1j\u00e1rul\u00e1s": {}, 
-                    "K\u00f6zteherjegy": {}, 
-                    "Munkaad\u00f3i j\u00e1rul\u00e9k": {}, 
-                    "Rehabilit\u00e1ci\u00f3s hozz\u00e1j\u00e1rul\u00e1s": {}, 
-                    "Szakk\u00e9pz\u00e9si hozz\u00e1j\u00e1rul\u00e1s": {}, 
-                    "T\u00e1rsadalombiztos\u00edt\u00e1si j\u00e1rul\u00e9k": {}
-                }, 
-                "B\u00c9RK\u00d6LTS\u00c9G": {
-                    "Egyszer\u00fbs\u00edtett fogl. b\u00e9rk\u00f6lts\u00e9ge": {}, 
-                    "Megb\u00edz\u00e1si d\u00edjak b\u00e9rk\u00f6lts\u00e9g terh\u00e9re": {}, 
-                    "Munkav\u00e1llal\u00f3k munkab\u00e9r k\u00f6lts\u00e9ge": {}, 
-                    "Tagok szem\u00e9lyes k\u00f6zr. ellen\u00e9rt\u00e9ke": {}
-                }, 
-                "EGY\u00c9B SZOLG\u00c1LTAT\u00c1SOK K\u00d6LTS\u00c9GEI": {
-                    "Biztos\u00edt\u00e1si d\u00edjak": {}, 
-                    "Hat\u00f3s\u00e1gi igazgat\u00e1si d\u00edjak (illet\u00e9kek)": {}, 
-                    "P\u00e9nz\u00fcgyi szolg-i d\u00edjak, bankk\u00f6lts\u00e9gek": {}
-                }, 
-                "IG\u00c9NYBE VETT SZOLG\u00c1LTAT\u00c1SOK K\u00d6LTS\u00c9GEI": {
-                    "B\u00e9rleti d\u00edjak": {}, 
-                    "Egy\u00e9b ig\u00e9nybevett szolg\u00e1ltat\u00e1sok ktg-ei": {}, 
-                    "Hirdet\u00e9s, rekl\u00e1m-propaganda k\u00f6lts\u00e9g": {}, 
-                    "Jav\u00edt\u00e1si, karbantart\u00e1si k\u00f6lts\u00e9gek": {}, 
-                    "Oktat\u00e1si, tov\u00e1bbk\u00e9pz\u00e9si k\u00f6lts\u00e9gek": {}, 
-                    "Postai, t\u00e1vk\u00f6zl\u00e9si k\u00f6lts\u00e9gek": {}, 
-                    "Szakk\u00f6nyv, foly\u00f3irat, napilap beszerz\u00e9s": {}, 
-                    "Sz\u00e1ll\u00edt\u00e1si, rakod\u00e1si k\u00f6lts\u00e9g": {}, 
-                    "Utaz\u00e1si- \u00e9s kik\u00fcldet\u00e9si k\u00f6lts\u00e9gek": {}
-                }, 
-                "K\u00d6LTS\u00c9GNEM \u00c1TVEZET\u00c9SI SZ\u00c1MLA": {
-                    "Anyagk\u00f6lts\u00e9g \u00e1tvezet\u00e9si szla": {}, 
-                    "B\u00e9rj\u00e1rul\u00e9kok \u00e1tvezet\u00e9si szla": {}, 
-                    "B\u00e9rk\u00f6lts\u00e9g \u00e1tvezet\u00e9si szla": {}, 
-                    "Egy\u00e9b szolg\u00e1ltat\u00e1sok \u00e1tvezet\u00e9si szla": {}, 
-                    "Ig\u00e9nybevett szolg. \u00e1tvezet\u00e9si szla": {}, 
-                    "Szem\u00e9lyi jell. kif. \u00e1tvezet\u00e9si szla": {}, 
-                    "\u00c9rt\u00e9kcs\u00f6kken\u00e9si le\u00edr\u00e1s \u00e1tvez. szla": {}
-                }, 
-                "SZEM\u00c9LYI JELLEG\u00fb EGY\u00c9B KIFIZET\u00c9SEK": {
-                    "Egy\u00e9b szem\u00e9lyi jelleg\u00fb kifizet\u00e9sek": {}, 
-                    "Foglalkoztat\u00f3t terhel\u00f5 t\u00e1pp\u00e9nz hj\u00e1rul\u00e1s": {}, 
-                    "J\u00f3l\u00e9ti \u00e9s kultur\u00e1lis k\u00f6lts\u00e9gek": {}, 
-                    "Kifizet\u00f5t terhel\u00f5 szem\u00e9lyi j\u00f6vedelemad\u00f3": {}, 
-                    "Mag\u00e1nnyugd\u00edjp\u00e9nzt\u00e1ri tagd\u00edjak, hozz\u00e1j\u00e1r.": {}, 
-                    "Szem\u00e9lyi jelleg\u00fb kifizet\u00e9sek": {}, 
-                    "Term\u00e9szetbeni juttat\u00e1sok": {}
-                }, 
-                "\u00c9RT\u00c9KCS\u00d6KKEN\u00c9SI LE\u00cdR\u00c1S": {
-                    "Terv szerinti egy\u00f6sszeg\u00fb (kis\u00e9rt\u00e9k\u00fbek)": {}, 
-                    "Terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9s line\u00e1ris": {}
-                }
-            }, 
-            "root_type": ""
-        }, 
-        "M\u00e9rleg sz\u00e1ml\u00e1k": {
-            "BEFEKTETETT ESZK\u00d6Z\u00d6K": {
-                "BEFEKTETETT P\u00fc.I ESZK\u00d6Z\u00d6K R\u00c9SZESED\u00c9SEK": {
-                    "Egy\u00e9b tart\u00f3s r\u00e9szesed\u00e9s": {}, 
-                    "R\u00e9szesed\u00e9sek \u00e9rt\u00e9khelyesb\u00edt\u00e9se": {}, 
-                    "R\u00e9szesed\u00e9sek \u00e9rt\u00e9kveszt\u00e9se, vissza\u00edr\u00e1sa": {}, 
-                    "Tart\u00f3s r\u00e9szesed\u00e9s kapcs. v\u00e1llalkoz\u00e1sban": {}
-                }, 
-                "BERUH\u00c1Z\u00c1SOK, FEL\u00faJ\u00cdT\u00c1SOK": {
-                    "Befejezetlen beruh\u00e1z\u00e1sok": {}, 
-                    "Beruh\u00e1z\u00e1sok terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kk.": {}, 
-                    "Fel\u00faj\u00edt\u00e1sok": {}
-                }, 
-                "EGY\u00c9B BERENDEZ\u00c9SEK, FELSZ., J\u00c1RM\u00dcVEK": {
-                    "Egy\u00e9b g\u00e9pek,felsz,j\u00e1rm. \u00e9rt\u00e9khelyesb\u00edt\u00e9s": {}, 
-                    "Egy\u00e9b j\u00e1rm\u00fbvek": {}, 
-                    "Irodai, igazgat\u00e1si berendez\u00e9sek": {}, 
-                    "\u00dczemi berendez\u00e9sek, g\u00e9pek,felszerel\u00e9sek": {}, 
-                    "\u00dczemk\u00f6r\u00f6n kiv\u00fcli berendez\u00e9sek, felsz.": {}
-                }, 
-                "HITELVISZONYT MEGTESTES\u00cdT\u00d6 \u00c9RT\u00c9KPAP\u00cdROK": {
-                    "Egy\u00e9b v\u00e1llalkoz\u00e1sok \u00e9rt\u00e9kpap\u00edrjai": {}, 
-                    "Kapcsolt v\u00e1llalkoz\u00e1sok \u00e9rt\u00e9kpap\u00edrjai": {}, 
-                    "Tart\u00f3s diszkont \u00e9rt\u00e9kpap\u00edrok": {}, 
-                    "\u00c1llamk\u00f6tv\u00e9nyek": {}, 
-                    "\u00c9rt\u00e9kpap\u00edrok \u00e9rt\u00e9kveszt\u00e9se, vissza\u00edr\u00e1sa": {}
-                }, 
-                "IMMATERI\u00c1LIS JAVAK": {
-                    "Alap\u00edt\u00e1s-\u00e1tszervez\u00e9s akt\u00edv\u00e1lt \u00e9rt\u00e9ke": {}, 
-                    "Immateri\u00e1lis javak \u00e9rt\u00e9khelyesb\u00edt\u00e9se": {}, 
-                    "K\u00eds\u00e9rleti fejleszt\u00e9s akt\u00edv\u00e1lt \u00e9rt\u00e9ke": {}, 
-                    "Szellemi term\u00e9kek": {}, 
-                    "Vagyoni \u00e9rt\u00e9k\u00fb jogok": {}, 
-                    "\u00dczleti vagy c\u00e9g\u00e9rt\u00e9k": {}
-                }, 
-                "INGATLANOK, KAPCS. VAGYONI \u00c9RT. JOGOK": {
-                    "Egy\u00e9b \u00e9p\u00edtm\u00e9nyek": {}, 
-                    "F\u00f6ldter\u00fclet": {}, 
-                    "Ingatlanhoz kapcs. vagyoni \u00e9rt. jogok": {}, 
-                    "Ingatlanok \u00e9rt\u00e9khelyesb\u00edt\u00e9se": {}, 
-                    "Telek, telkes\u00edt\u00e9s": {}, 
-                    "\u00c9p\u00fcletek,\u00e9p\u00fcletr\u00e9szek,tulajdoni h\u00e1nyadok": {}, 
-                    "\u00dczemk\u00f6r\u00f6n kiv\u00fcli ingatlanok, \u00e9p\u00fcletek": {}
-                }, 
-                "M\u00dcSZAKI BERENDEZ\u00c9SEK, G\u00c9PEK, J\u00c1RM\u00dcVEK": {
-                    "M\u00fcszaki g\u00e9pek,felsz,j\u00e1rm. \u00e9rt\u00e9khelyesb.": {}, 
-                    "Termel\u00e9sben r\u00e9sztvev\u00f5 j\u00e1rm\u00fbvek": {}, 
-                    "Termel\u00f5 g\u00e9pek, berendez\u00e9sek, gy\u00e1rt\u00f3eszk.": {}
-                }, 
-                "TART\u00d3SAN ADOTT K\u00d6LCS\u00d6N\u00d6K": {
-                    "Egy\u00e9b tart\u00f3s bankbet\u00e9tek": {}, 
-                    "Egy\u00e9b tart\u00f3san adott k\u00f6lcs\u00f6n\u00f6k": {}, 
-                    "P\u00e9nz\u00fcgyi l\u00edzing miatti tart\u00f3s k\u00f6vetel\u00e9s": {}, 
-                    "Tart\u00f3s bankbet\u00e9tek egy\u00e9b r\u00e9sz. v\u00e1ll.-ban": {}, 
-                    "Tart\u00f3s bankbet\u00e9tek kapcs. v\u00e1ll.-ban": {}, 
-                    "Tart\u00f3san adott k\u00f6lcs\u00f6n egy\u00e9b r\u00e9sz.v\u00e1ll.": {}, 
-                    "Tart\u00f3san adott k\u00f6lcs\u00f6n\u00f6k kapcs. v\u00e1ll.": {}, 
-                    "Tart\u00f3san adott k\u00f6lcs\u00f6n\u00f6k \u00e9rt\u00e9kveszt\u00e9se": {}
-                }, 
-                "TENY\u00c9SZ\u00c1LLATOK": {
-                    "Teny\u00e9sz\u00e1llatok": {}
-                }
-            }, 
-            "FORR\u00c1SOK (PASSZ\u00cdV\u00c1K)": {
-                "C\u00c9LTARTAL\u00c9KOK": {
-                    "C\u00e9ltartal\u00e9k v\u00e1rhat\u00f3 k\u00f6telezetts\u00e9gre": {}
-                }, 
-                "EGY\u00c9B R\u00d6VID LEJ\u00c1RAT\u00fa K\u00d6TELEZETTS\u00c9GEK": {
-                    "El\u00f5zetesen felsz\u00e1m\u00edtott \u00e1lt.forgalmi ad\u00f3": {}, 
-                    "Fizetend\u00f5 \u00e1ltal\u00e1nos forgalmi ad\u00f3": {}, 
-                    "K\u00f6lts\u00e9gvet\u00e9si befizet\u00e9si k\u00f6t.teljes\u00edt\u00e9se": {}, 
-                    "K\u00f6lts\u00e9gvet\u00e9si befizet\u00e9si k\u00f6telezetts\u00e9gek": {}, 
-                    "Szem\u00e9lyi j\u00f6vedelemad\u00f3 elsz\u00e1mol\u00e1sa": {}, 
-                    "T\u00e1rsas\u00e1gi ad\u00f3 \u00e9s osztal\u00e9kad\u00f3 elsz\u00e1mol\u00e1s": {}, 
-                    "V\u00e1m- \u00e9s P\u00e9nz\u00fcgy\u00f5rs\u00e9g elsz\u00e1mol\u00e1si sz\u00e1mla": {}, 
-                    "\u00c1fa p\u00e9nz\u00fcgyi elsz\u00e1mol\u00e1si sz\u00e1mla": {}, 
-                    "\u00d6nkorm\u00e1nyzati ad\u00f3k elsz\u00e1mol\u00e1si sz\u00e1mla": {}
-                }, 
-                "HOSSZ\u00da LEJ\u00c1RAT\u00da K\u00d6TELEZETTS\u00c9GEK": {
-                    "Beruh\u00e1z\u00e1si \u00e9s fejleszt\u00e9si hitelek": {}, 
-                    "Egy\u00e9b hossz\u00fa lej. k\u00f6telezetts\u00e9gek": {}, 
-                    "Egy\u00e9b hossz\u00fa lej\u00e1rat\u00fa hitelek": {}, 
-                    "Hossz\u00fa lej\u00e1ratra kapott k\u00f6lcs\u00f6n\u00f6k": {}, 
-                    "P\u00e9nz\u00fcgyi l\u00edzinggel kapcsolatos k\u00f6telez.": {}, 
-                    "Tartoz\u00e1sok k\u00f6tv\u00e9nykibocs\u00e1t\u00e1sb\u00f3l": {}, 
-                    "Tart\u00f3s k\u00f6t. egy\u00e9b r\u00e9sz. v\u00e1ll. szemben": {}, 
-                    "Tart\u00f3s k\u00f6t. kapcs. v\u00e1llalkoz\u00e1ssal sz.": {}, 
-                    "\u00c1tv\u00e1ltoztathat\u00f3 k\u00f6tv\u00e9nyek": {}
-                }, 
-                "H\u00c1TRASOROLT K\u00d6TELEZETTS\u00c9GEK": {
-                    "H\u00e1trasorolt k\u00f6telezetts\u00e9g": {}
-                }, 
-                "PASSZ\u00cdV ID\u00d6BELI ELHAT\u00c1ROL\u00c1S": {
-                    "Bev\u00e9telek passz\u00edv id\u00f5beli elhat\u00e1rol\u00e1sa": {}, 
-                    "Halasztott bev\u00e9telek": {}, 
-                    "K\u00f6lts\u00e9gek,r\u00e1ford. passz\u00edv id\u00f5beli elhat.": {}
-                }, 
-                "R\u00d6VID LEJ\u00c1RAT\u00fa K\u00d6TELEZETTS\u00c9GEK": {
-                    "R\u00f6vid lej\u00e1rat\u00fa hitelek": {}, 
-                    "R\u00f6vid lej\u00e1rat\u00fa k\u00f6lcs\u00f6n\u00f6k": {}, 
-                    "Sz\u00e1ll\u00edt\u00f3k": {
-                        "Belf\u00f6ldi sz\u00e1ll\u00edt\u00f3k": {
-                            "account_type": "Payable"
-                        }, 
-                        "K\u00fclf\u00f6ldi sz\u00e1ll\u00edt\u00f3k": {
-                            "account_type": "Payable"
-                        }
-                    }, 
-                    "Vev\u00f5kt\u00f5l kapott el\u00f5legek": {}
-                }, 
-                "SAJ\u00c1T T\u00d6KE": {
-                    "Eredm\u00e9nytartal\u00e9k": {}, 
-                    "Jegyzett t\u00f5ke": {}, 
-                    "Lek\u00f6t\u00f6tt tartal\u00e9k": {}, 
-                    "M\u00e9rleg szerinti eredm\u00e9ny": {}, 
-                    "T\u00f5ketartal\u00e9k": {}, 
-                    "\u00c9rt\u00e9kel\u00e9si tartal\u00e9k": {}
-                }, 
-                "\u00c9VI M\u00c9RLEG SZ\u00c1ML\u00c1K": {
-                    "Nyit\u00f3m\u00e9rleg sz\u00e1mla": {}
-                }
-            }, 
-            "K\u00c9SZLETEK": {
-                "ANYAGOK": {
-                    "Seg\u00e9danyagok": {}
-                }, 
-                "BEFEJEZETLEN TERMEL\u00c9S \u00c9S F\u00c9LK\u00c9SZTERM\u00c9KEK": {
-                    "Befejezetlen termel\u00e9s": {}
-                }, 
-                "BET\u00c9TD\u00cdJAS G\u00d6NGY\u00d6LEGEK": {
-                    "Bet\u00e9td\u00edjas g\u00f6ngy\u00f6legek": {}
-                }, 
-                "K\u00c9SZTERM\u00c9KEK": {
-                    "K\u00e9szterm\u00e9kek": {}
-                }, 
-                "K\u00d6ZVET\u00cdTETT SZOLG\u00c1LTAT\u00c1SOK": {
-                    "K\u00f6zvet\u00edtett szolg\u00e1ltat\u00e1sok": {}
-                }, 
-                "\u00c1RUK": {
-                    "\u00c1ruk beszerz\u00e9si \u00e1ron": {}
-                }
-            }, 
-            "K\u00d6VETEL\u00c9SEK,P\u00c9NZ\u00dcGYI ESZK,AKT\u00cdV ID\u00d6B.ELH": {
-                "ADOTT EL\u00d6LEGEK": {
-                    "Adott el\u00f5legek": {}
-                }, 
-                "AKT\u00cdV ID\u00d6BELI ELHAT\u00c1ROL\u00c1S": {
-                    "Akt\u00edv id\u00f5beli elhat\u00e1rol\u00e1sa": {}
-                }, 
-                "EGY\u00c9B K\u00d6VETEL\u00c9SEK": {
-                    "K\u00fcl\u00f6nf\u00e9le egy\u00e9b k\u00f6vetel\u00e9sek": {}, 
-                    "Munkav\u00e1llal\u00f3kkal szembeni k\u00f6vetel\u00e9s": {}
-                }, 
-                "K\u00d6VETEL\u00c9SEK \u00c1RUSZ\u00c1LL.- SZOLG\u00c1LTAT\u00c1SB\u00d3L": {
-                    "Belf\u00f6ldi k\u00f6vetel\u00e9sek": {
-                        "account_type": "Receivable"
-                    }, 
-                    "K\u00fclf\u00f6ldi k\u00f6vetel\u00e9sek": {
-                        "account_type": "Receivable"
-                    }
-                }, 
-                "P\u00c9NZESZK\u00d6Z\u00d6K": {
-                    "Deviza bet\u00e9tsz\u00e1mla": {
-                        "account_type": "Bank"
-                    }, 
-                    "Elk\u00fcl\u00f6n\u00edtett bet\u00e9tsz\u00e1ml\u00e1k": {
-                        "account_type": "Bank"
-                    }, 
-                    "Elsz\u00e1mol\u00e1si bet\u00e9tsz\u00e1mla": {
-                        "Banksz\u00e1mla": {
-                            "account_type": "Bank"
-                        }
-                    }, 
-                    "P\u00e9nzhelyettes\u00edt\u00f5 eszk. (utalv\u00e1ny, jegy)": {
-                        "account_type": "Bank"
-                    }, 
-                    "P\u00e9nzt\u00e1rak": {
-                        "P\u00e9nzt\u00e1r": {
-                            "account_type": "Cash"
-                        }
-                    }, 
-                    "Valuta p\u00e9nzt\u00e1r": {
-                        "account_type": "Cash"
-                    }, 
-                    "\u00c1tvezet\u00e9si sz\u00e1mla": {
-                        "account_type": "Bank"
-                    }
-                }, 
-                "\u00c9RT\u00c9KPAP\u00cdROK": {
-                    "Egy\u00e9b r\u00e9szesed\u00e9s": {}, 
-                    "Forgat\u00e1si c\u00e9l\u00fa hitelv. m. \u00e9rt\u00e9kpap\u00edrok": {}, 
-                    "R\u00e9szesed\u00e9s kapcsolt v\u00e1llalkoz\u00e1sban": {}, 
-                    "Saj\u00e1t r\u00e9szv\u00e9nyek, saj\u00e1t \u00fczletr\u00e9szek": {}
-                }
-            }, 
-            "root_type": ""
-        }
-    }
-}

erpnext/accounts/doctype/account/chart_of_accounts/unverified/nl_l10nnl_chart_template.json

@@ -1,716 +0,0 @@
-{
-    "country_code": "nl", 
-    "name": "Nederlands - Grootboekschema", 
-    "tree": {
-        "FABRIKAGEREKENINGEN": {
-            "root_type": ""
-        }, 
-        "FINANCIELE REKENINGEN, KORTLOPENDE VORDERINGEN EN SCHULDEN": {
-            "KORTLOPENDE SCHULDEN": {
-                "Accountantskosten": {}, 
-                "Af te dragen Btw-verlegd": {
-                    "account_type": "Tax"
-                }, 
-                "Afdracht loonheffing": {}, 
-                "Btw af te dragen hoog": {
-                    "account_type": "Tax"
-                }, 
-                "Btw af te dragen laag": {
-                    "account_type": "Tax"
-                }, 
-                "Btw af te dragen overig": {
-                    "account_type": "Tax"
-                }, 
-                "Btw oude jaren": {
-                    "account_type": "Tax"
-                }, 
-                "Btw te vorderen hoog": {
-                    "account_type": "Tax"
-                }, 
-                "Btw te vorderen laag": {
-                    "account_type": "Tax"
-                }, 
-                "Btw te vorderen overig": {
-                    "account_type": "Tax"
-                }, 
-                "Btw-afdracht": {
-                    "account_type": "Tax"
-                }, 
-                "Crediteuren": {
-                    "account_type": "Payable"
-                }, 
-                "Dividend": {}, 
-                "Dividendbelasting": {}, 
-                "Energiekosten": {}, 
-                "Investeringsaftrek": {}, 
-                "Loonheffing": {}, 
-                "Overige te betalen posten": {}, 
-                "Pensioenpremies": {}, 
-                "Premie WIR": {}, 
-                "Rekening-courant inkoopvereniging": {}, 
-                "Rente": {}, 
-                "Sociale lasten": {}, 
-                "Tanti\u00e8mes": {}, 
-                "Te vorderen Btw-verlegd": {
-                    "account_type": "Tax"
-                }, 
-                "Telefoon/telefax": {}, 
-                "Termijnen onderh. werk": {}, 
-                "Vakantiedagen": {}, 
-                "Vakantiegeld": {}, 
-                "Vakantiezegels": {}, 
-                "Vennootschapsbelasting": {}, 
-                "Vooruit ontvangen bedr.": {}
-            }, 
-            "LIQUIDE MIDDELEN": {
-                "ABN-AMRO bank": {
-                    "account_type": "Cash"
-                }, 
-                "BIZNER bank": {
-                    "account_type": "Cash"
-                }, 
-                "Bankbetaalkaarten": {}, 
-                "Effecten": {}, 
-                "Girobetaalkaarten": {}, 
-                "Kas": {
-                    "account_type": "Cash"
-                }, 
-                "Kas  valuta": {
-                    "account_type": "Cash"
-                }, 
-                "Kleine kas": {
-                    "account_type": "Cash"
-                }, 
-                "Kruisposten": {}, 
-                "Postbank": {
-                    "account_type": "Cash"
-                }, 
-                "RABO bank": {
-                    "account_type": "Cash"
-                }
-            }, 
-            "VORDERINGEN": {
-                "Debiteuren": {
-                    "account_type": "Receivable"
-                }, 
-                "Dubieuze debiteuren": {}, 
-                "Overige vorderingen": {}, 
-                "Rekening-courant directie": {}, 
-                "Te ontvangen ziekengeld": {}, 
-                "Voorschotten personeel": {}, 
-                "Vooruitbetaalde kosten": {}, 
-                "Voorziening dubieuze debiteuren": {}
-            }, 
-            "root_type": ""
-        }, 
-        "INDIRECTE KOSTEN": {
-            "root_type": ""
-        }, 
-        "KOSTENREKENINGEN": {
-            "AFSCHRIJVINGEN": {
-                "Aanhangwagens": {}, 
-                "Aankoopkosten": {}, 
-                "Aanloopkosten": {}, 
-                "Auteursrechten": {}, 
-                "Bedrijfsgebouwen": {}, 
-                "Bedrijfsinventaris": {}, 
-                "Drankvergunningen": {}, 
-                "Fabrieksinventaris": {}, 
-                "Gebouwen": {}, 
-                "Gereedschappen": {}, 
-                "Goodwill": {}, 
-                "Grondverbetering": {}, 
-                "Heftrucks": {}, 
-                "Kantine-inventaris": {}, 
-                "Kantoorinventaris": {}, 
-                "Kantoormachines": {}, 
-                "Licenties": {}, 
-                "Machines": {}, 
-                "Magazijninventaris": {}, 
-                "Octrooien": {}, 
-                "Ontwikkelingskosten": {}, 
-                "Pachtersinvestering": {}, 
-                "Parkeerplaats": {}, 
-                "Personenauto's": {}, 
-                "Rijwielen en bromfietsen": {}, 
-                "Tonnagevergunningen": {}, 
-                "Verbouwingen": {}, 
-                "Vergunningen": {}, 
-                "Voorraadverschillen": {}, 
-                "Vrachtauto's": {}, 
-                "Winkels": {}, 
-                "Woon-winkelhuis": {}
-            }, 
-            "ALGEMENE KOSTEN": {
-                "Accountantskosten": {}, 
-                "Advieskosten": {}, 
-                "Assuranties": {}, 
-                "Bankkosten": {}, 
-                "Juridische kosten": {}, 
-                "Overige algemene kosten": {}, 
-                "Toev. Ass. eigen risico": {}
-            }, 
-            "BEDRIJFSKOSTEN": {
-                "Assuranties": {}, 
-                "Energie (krachtstroom)": {}, 
-                "Gereedschappen": {}, 
-                "Hulpmaterialen": {}, 
-                "Huur inventaris": {}, 
-                "Huur machines": {}, 
-                "Leasing invent.operational": {}, 
-                "Leasing mach. operational": {}, 
-                "Onderhoud inventaris": {}, 
-                "Onderhoud machines": {}, 
-                "Ophalen/vervoer afval": {}, 
-                "Overige bedrijfskosten": {}
-            }, 
-            "FINANCIERINGSKOSTEN": {
-                "Overige rentebaten": {}, 
-                "Overige rentelasten": {}, 
-                "Rente bankkrediet": {}, 
-                "Rente huurkoopcontracten": {}, 
-                "Rente hypotheek": {}, 
-                "Rente leasecontracten": {}, 
-                "Rente lening o/g": {}, 
-                "Rente lening u/g": {}
-            }, 
-            "HUISVESTINGSKOSTEN": {
-                "Assurantie onroerend goed": {}, 
-                "Belastingen onr. Goed": {}, 
-                "Energiekosten": {}, 
-                "Groot onderhoud onr. Goed": {}, 
-                "Huur": {}, 
-                "Huurwaarde woongedeelte": {}, 
-                "Onderhoud onroerend goed": {}, 
-                "Ontvangen huren": {}, 
-                "Overige huisvestingskosten": {}, 
-                "Pacht": {}, 
-                "Schoonmaakkosten": {}, 
-                "Toevoeging egalisatieres. Groot onderhoud": {}
-            }, 
-            "KANTOORKOSTEN": {
-                "Administratiekosten": {}, 
-                "Contributies/abonnementen": {}, 
-                "Huur kantoorapparatuur": {}, 
-                "Internetaansluiting": {}, 
-                "Kantoorbenodigdh./drukw.": {}, 
-                "Onderhoud kantoorinvent.": {}, 
-                "Overige kantoorkosten": {}, 
-                "Porti": {}, 
-                "Telefoon/telefax": {}
-            }, 
-            "OVERIGE BATEN EN LASTEN": {
-                "Betaalde schadevergoed.": {}, 
-                "Boekverlies vaste activa": {}, 
-                "Boekwinst van vaste activa": {}, 
-                "K.O. regeling OB": {}, 
-                "Kasverschillen": {}, 
-                "Kosten loonbelasting": {}, 
-                "Kosten omzetbelasting": {}, 
-                "Nadelige koersverschillen": {}, 
-                "Naheffing bedrijfsver.": {}, 
-                "Ontvangen schadevergoed.": {}, 
-                "Overige baten": {}, 
-                "Overige lasten": {}, 
-                "Voordelige koersverschil.": {}
-            }, 
-            "PERSONEELSKOSTEN": {
-                "Autokostenvergoeding": {}, 
-                "Bedrijfskleding": {}, 
-                "Belastingvrije uitkeringen": {}, 
-                "Bijzondere beloningen": {}, 
-                "Congressen, seminars en symposia": {}, 
-                "Gereedschapsgeld": {}, 
-                "Geschenken personeel": {}, 
-                "Gratificaties": {}, 
-                "Inhouding pensioenpremies": {}, 
-                "Inhouding sociale lasten": {}, 
-                "Kantinekosten": {}, 
-                "Lonen en salarissen": {}, 
-                "Loonwerk": {}, 
-                "Managementvergoedingen": {}, 
-                "Opleidingskosten": {}, 
-                "Oprenting stamrechtverpl.": {}, 
-                "Overhevelingstoeslag": {}, 
-                "Overige kostenverg.": {}, 
-                "Overige personeelskosten": {}, 
-                "Overige uitkeringen": {}, 
-                "Pensioenpremies": {}, 
-                "Provisie": {}, 
-                "Reiskosten": {}, 
-                "Rijwielvergoeding": {}, 
-                "Sociale lasten": {}, 
-                "Tanti\u00e8mes": {}, 
-                "Thuiswerkers": {}, 
-                "Toev. Backservice pens.verpl.": {}, 
-                "Toevoeging pensioenverpl.": {}, 
-                "Uitkering ziekengeld": {}, 
-                "Uitzendkrachten": {}, 
-                "Vakantiebonnen": {}, 
-                "Vakantiegeld": {}, 
-                "Vergoeding studiekosten": {}, 
-                "Wervingskosten personeel": {}
-            }, 
-            "VERKOOPKOSTEN": {
-                "Advertenties": {}, 
-                "Afschrijving dubieuze deb.": {}, 
-                "Beurskosten": {}, 
-                "Etalagekosten": {}, 
-                "Exportkosten": {}, 
-                "Kascorrecties": {}, 
-                "Overige verkoopkosten": {}, 
-                "Provisie": {}, 
-                "Reclame": {}, 
-                "Reis en verblijfkosten": {}, 
-                "Relatiegeschenken": {}, 
-                "Representatiekosten": {}, 
-                "Uitgaande vrachten": {}, 
-                "Veilingkosten": {}, 
-                "Verpakkingsmateriaal": {}, 
-                "Websitekosten": {}
-            }, 
-            "VERVOERSKOSTEN": {
-                "Assuranties auto's": {}, 
-                "Brandstoffen": {}, 
-                "Leasing auto's": {}, 
-                "Onderhoud personenauto's": {}, 
-                "Onderhoud vrachtauto's": {}, 
-                "Overige vervoerskosten": {}, 
-                "Priv\u00e9-gebruik auto's": {}, 
-                "Wegenbelasting": {}
-            }, 
-            "root_type": ""
-        }, 
-        "OVERIGE RESULTATEN": {
-            "Memoriaal": {
-                "account_type": "Cash"
-            }, 
-            "Opbrengsten deelnemingen": {}, 
-            "Reorganisatiekosten": {}, 
-            "Verlies verkoop deelnem.": {}, 
-            "Voorz. Verlies deelnem.": {}, 
-            "Vpb bijzonder resultaat": {}, 
-            "Vpb normaal resultaat": {}, 
-            "Winst": {}, 
-            "Winst bij verkoop deelnem.": {}, 
-            "root_type": ""
-        }, 
-        "TUSSENREKENINGEN": {
-            "Betaalwijze cadeaubonnen": {
-                "account_type": "Cash"
-            }, 
-            "Betaalwijze chipknip": {
-                "account_type": "Cash"
-            }, 
-            "Betaalwijze contant": {
-                "account_type": "Cash"
-            }, 
-            "Betaalwijze pin": {
-                "account_type": "Cash"
-            }, 
-            "Inkopen Nederland hoog": {
-                "account_type": "Cash"
-            }, 
-            "Inkopen Nederland laag": {
-                "account_type": "Cash"
-            }, 
-            "Inkopen Nederland onbelast": {
-                "account_type": "Cash"
-            }, 
-            "Inkopen Nederland overig": {
-                "account_type": "Cash"
-            }, 
-            "Inkopen Nederland verlegd": {
-                "account_type": "Cash"
-            }, 
-            "Inkopen binnen EU hoog": {
-                "account_type": "Cash"
-            }, 
-            "Inkopen binnen EU laag": {
-                "account_type": "Cash"
-            }, 
-            "Inkopen binnen EU overig": {
-                "account_type": "Cash"
-            }, 
-            "Inkopen buiten EU hoog": {
-                "account_type": "Cash"
-            }, 
-            "Inkopen buiten EU laag": {
-                "account_type": "Cash"
-            }, 
-            "Inkopen buiten EU overig": {
-                "account_type": "Cash"
-            }, 
-            "Kassa 1": {
-                "account_type": "Cash"
-            }, 
-            "Kassa 2": {
-                "account_type": "Cash"
-            }, 
-            "Netto lonen": {
-                "account_type": "Cash"
-            }, 
-            "Tegenrekening Inkopen": {
-                "account_type": "Cash"
-            }, 
-            "Tussenrek. autom. betalingen": {
-                "account_type": "Cash"
-            }, 
-            "Tussenrek. autom. loonbetalingen": {
-                "account_type": "Cash"
-            }, 
-            "Tussenrek. cadeaubonbetalingen": {
-                "account_type": "Cash"
-            }, 
-            "Tussenrekening balans": {
-                "account_type": "Cash"
-            }, 
-            "Tussenrekening chipknip": {
-                "account_type": "Cash"
-            }, 
-            "Tussenrekening correcties": {
-                "account_type": "Cash"
-            }, 
-            "Tussenrekening pin": {
-                "account_type": "Cash"
-            }, 
-            "Vraagposten": {
-                "account_type": "Cash"
-            }, 
-            "root_type": ""
-        }, 
-        "VASTE ACTIVA, EIGEN VERMOGEN, LANGLOPEND VREEMD VERMOGEN EN VOORZIENINGEN": {
-            "EIGEN VERMOGEN": {
-                "Aandelenkapitaal": {
-                    "account_type": "Equity"
-                }, 
-                "Assuranties": {
-                    "account_type": "Equity"
-                }, 
-                "Buitengewone lasten": {
-                    "account_type": "Equity"
-                }, 
-                "Giften": {
-                    "account_type": "Equity"
-                }, 
-                "Huishoudgeld": {
-                    "account_type": "Equity"
-                }, 
-                "Inkomstenbelasting": {
-                    "account_type": "Equity"
-                }, 
-                "Kapitaal": {
-                    "account_type": "Equity"
-                }, 
-                "Overige persoonlijke verplichtingen": {
-                    "account_type": "Equity"
-                }, 
-                "Overige priv\u00e9-uitgaven": {
-                    "account_type": "Equity"
-                }, 
-                "Overige reserves": {
-                    "account_type": "Equity"
-                }, 
-                "Premie lijfrenteverzekeringen": {
-                    "account_type": "Equity"
-                }, 
-                "Premie volksverzekeringen": {
-                    "account_type": "Equity"
-                }, 
-                "Priv\u00e9-gebruik": {
-                    "account_type": "Equity"
-                }, 
-                "Priv\u00e9-opnamen/stortingen": {
-                    "account_type": "Equity"
-                }, 
-                "Vermogensbelasting": {
-                    "account_type": "Equity"
-                }, 
-                "WAO en ziekengeldverzekeringen": {
-                    "account_type": "Equity"
-                }, 
-                "Wettelijke reserves": {
-                    "account_type": "Equity"
-                }
-            }, 
-            "FINANCIELE VASTE ACTIVA EN LANGLOPENDE VORDERINGEN": {
-                "FINANCIELE VASTE ACTIVA": {
-                    "Aandeel inkoopcombinatie": {}, 
-                    "Meerderheidsdeelnemingen": {}, 
-                    "Minderheidsdeelnemingen": {}
-                }, 
-                "LANGLOPENDE VORDERINGEN": {
-                    "Financieringskosten": {}, 
-                    "Financieringskosten huurkoop": {}, 
-                    "Hypotheken u/g 1": {}, 
-                    "Hypotheken u/g 2": {}, 
-                    "Hypotheken u/g 3": {}, 
-                    "Leningen u/g 1": {}, 
-                    "Leningen u/g 2": {}, 
-                    "Leningen u/g 3": {}, 
-                    "Leningen u/g 4": {}, 
-                    "Leningen u/g 5": {}, 
-                    "Vorderingen op deelnemingen": {}, 
-                    "Waarborgsommen": {}
-                }
-            }, 
-            "IMMATERIELE ACTIVA": {
-                "Aanschafwaarde Aanloopkosten": {}, 
-                "Aanschafwaarde Auteursrechten": {}, 
-                "Aanschafwaarde Drankvergunningen": {}, 
-                "Aanschafwaarde Goodwill": {}, 
-                "Aanschafwaarde Octrooien": {}, 
-                "Aanschafwaarde Ontwikkelingskosten": {}, 
-                "Aanschafwaarde Tonnagevergunningen": {}, 
-                "Aanschafwaarde Vergunningen": {}, 
-                "Afschrijving Aanloopkosten": {}, 
-                "Afschrijving Auteursrechten": {}, 
-                "Afschrijving Drankvergunningen": {}, 
-                "Afschrijving Goodwill": {}, 
-                "Afschrijving Licenties": {}, 
-                "Afschrijving Octrooien": {}, 
-                "Afschrijving Ontwikkelingskosten": {}, 
-                "Afschrijving Tonnagevergunningen": {}, 
-                "Afschrijving Vergunningen": {}
-            }, 
-            "LANGLOPENDE SCHULDEN EN AFLOSSINGEN": {
-                "AFLOSSINGEN": {
-                    "Huurkoopverplichtingen": {}, 
-                    "Hypotheek o/g 1": {}, 
-                    "Hypotheek o/g 2": {}, 
-                    "Hypotheek o/g 3": {}, 
-                    "Hypotheek o/g 4": {}, 
-                    "Hypotheek o/g 5": {}, 
-                    "Lease-verplichtingen": {}
-                }, 
-                "LANGLOPENDE SCHULDEN": {
-                    "Huurkoopverplichtingen": {}, 
-                    "Hypotheken o/g 1": {}, 
-                    "Hypotheken o/g 2": {}, 
-                    "Hypotheken o/g 3": {}, 
-                    "Hypotheken o/g 4": {}, 
-                    "Hypotheken o/g 5": {}, 
-                    "Lease-verplichtingen": {}, 
-                    "Leningen o/g 1": {}, 
-                    "Leningen o/g 2": {}, 
-                    "Leningen o/g 3": {}, 
-                    "Leningen o/g 4": {}, 
-                    "Leningen o/g 5": {}, 
-                    "Rekening-courant directie": {}
-                }
-            }, 
-            "MACHINES EN INVENTARIS": {
-                "INVENTARIS": {
-                    "Aanschafwaarde Bedrijfsinventaris": {}, 
-                    "Aanschafwaarde Fabrieksinventaris": {}, 
-                    "Aanschafwaarde Gereedschappen": {}, 
-                    "Aanschafwaarde Kantine-inventaris": {}, 
-                    "Aanschafwaarde Kantoorinventaris": {}, 
-                    "Aanschafwaarde Kantoormachines": {}, 
-                    "Aanschafwaarde Magazijninventaris": {}, 
-                    "Afschrijving Bedrijfsinventaris": {}, 
-                    "Afschrijving Fabrieksinventaris": {}, 
-                    "Afschrijving Gereedschappen": {}, 
-                    "Afschrijving Kantine-inventaris": {}, 
-                    "Afschrijving Kantoorinventaris": {}, 
-                    "Afschrijving Kantoormachines": {}, 
-                    "Afschrijving Magazijninventaris": {}
-                }, 
-                "MACHINES": {
-                    "Aanschafwaarde Machines 1": {}, 
-                    "Aanschafwaarde Machines 2": {}, 
-                    "Aanschafwaarde Machines 3": {}, 
-                    "Aanschafwaarde Machines 4": {}, 
-                    "Aanschafwaarde Machines 5": {}, 
-                    "Afschrijving Machines 1": {}, 
-                    "Afschrijving Machines 2": {}, 
-                    "Afschrijving Machines 3": {}, 
-                    "Afschrijving Machines 4": {}, 
-                    "Afschrijving Machines 5": {}
-                }
-            }, 
-            "ONROERENDE GOEDEREN": {
-                "Aanschafwaarde Aanloopkosten": {}, 
-                "Aanschafwaarde Bedrijfsgebouwen": {}, 
-                "Aanschafwaarde Gebouwen": {}, 
-                "Aanschafwaarde Grondverbetering": {}, 
-                "Aanschafwaarde Landerijen": {}, 
-                "Aanschafwaarde Ondergrond gebouwen": {}, 
-                "Aanschafwaarde Pachtersinvesteringen": {}, 
-                "Aanschafwaarde Parkeerplaats": {}, 
-                "Aanschafwaarde Verbouwingen": {}, 
-                "Aanschafwaarde Winkels": {}, 
-                "Aanschafwaarde Woon-winkelhuis": {}, 
-                "Afschrijving Aanloopkosten": {}, 
-                "Afschrijving Bedrijfsgebouwen": {}, 
-                "Afschrijving Gebouwen": {}, 
-                "Afschrijving Grondverbetering": {}, 
-                "Afschrijving Pachtersinvesteringen": {}, 
-                "Afschrijving Parkeerplaats": {}, 
-                "Afschrijving Verbouwingen": {}, 
-                "Afschrijving Winkels": {}, 
-                "Afschrijving Woon-winkelhuis": {}
-            }, 
-            "VERVOERMIDDELEN": {
-                "Aanschafwaarde Aanhangwagens": {}, 
-                "Aanschafwaarde Heftrucks": {}, 
-                "Aanschafwaarde Personenauto's": {}, 
-                "Aanschafwaarde Rijwielen en bromfietsen": {}, 
-                "Aanschafwaarde Vrachtauto's": {}, 
-                "Afschrijving Aanhangwagens": {}, 
-                "Afschrijving Heftrucks": {}, 
-                "Afschrijving Personenauto's": {}, 
-                "Afschrijving Rijwielen en bromfietsen": {}, 
-                "Afschrijving Vrachtauto's": {}
-            }, 
-            "VOORZIENINGEN": {
-                "Assurantie eigen risico": {
-                    "account_type": "Equity"
-                }, 
-                "Backservice pensioenverpl.": {
-                    "account_type": "Equity"
-                }, 
-                "Egalisatierekening WIR": {
-                    "account_type": "Equity"
-                }, 
-                "Egalisatieres. grootonderh.": {
-                    "account_type": "Equity"
-                }, 
-                "Garantieverplichtingen": {
-                    "account_type": "Equity"
-                }, 
-                "Latente belastingverpl.": {
-                    "account_type": "Equity"
-                }, 
-                "Pens.voorz. eigen beheer": {
-                    "account_type": "Equity"
-                }, 
-                "Pensioenverplichtingen": {
-                    "account_type": "Equity"
-                }, 
-                "Stamrechtverplichtingen": {
-                    "account_type": "Equity"
-                }, 
-                "Vervangingsreserve": {
-                    "account_type": "Equity"
-                }, 
-                "Voorziening deelnemingen": {
-                    "account_type": "Equity"
-                }
-            }, 
-            "root_type": ""
-        }, 
-        "VERKOOPRESULTATEN": {
-            "Diensten fabric. 0% niet-EU": {}, 
-            "Diensten fabricage 0% EU": {}, 
-            "Diensten fabricage hoog": {}, 
-            "Diensten fabricage laag": {}, 
-            "Diensten fabricage overig": {}, 
-            "Diensten handel 0% EU": {}, 
-            "Diensten handel 0% niet-EU": {}, 
-            "Diensten handel hoog tarief": {}, 
-            "Diensten handel laag tarief": {}, 
-            "Verkopen Fabric. 0% niet-EU": {}, 
-            "Verkopen Handel 0% niet-EU": {}, 
-            "Verkopen fabric. 0 % EU": {}, 
-            "Verkopen fabricage hoog": {}, 
-            "Verkopen fabricage laag": {}, 
-            "Verkopen fabricage overig": {}, 
-            "Verkopen handel 0% EU": {}, 
-            "Verkopen handel hoog": {}, 
-            "Verkopen handel laag": {}, 
-            "Verkopen handel overig": {}, 
-            "Verleende Kredietbep. fabricage": {}, 
-            "Verleende Kredietbep. handel": {}, 
-            "root_type": ""
-        }, 
-        "VOORRAAD GEREED PRODUCT EN ONDERHANDEN WERK": {
-            "Betalingskort. crediteuren": {}, 
-            "Garantiekosten": {}, 
-            "Hulpmaterialen": {}, 
-            "Inkomende vrachten": {}, 
-            "Inkoop import buiten EU hoog": {}, 
-            "Inkoop import buiten EU laag": {}, 
-            "Inkoop import buiten EU overig": {}, 
-            "Inkoopbonussen": {}, 
-            "Inkoopkosten": {}, 
-            "Inkoopprovisie": {}, 
-            "Inkopen BTW verlegd": {}, 
-            "Inkopen EU hoog tarief": {}, 
-            "Inkopen EU laag tarief": {}, 
-            "Inkopen EU overig": {}, 
-            "Inkopen hoog": {}, 
-            "Inkopen laag": {}, 
-            "Inkopen nul": {}, 
-            "Inkopen overig": {}, 
-            "Invoerkosten": {}, 
-            "Kosten inkoopvereniging": {}, 
-            "Kostprijs omzet grondstoffen": {}, 
-            "Kostprijs omzet handelsgoederen": {}, 
-            "Onttrekking uitgev.garantie": {}, 
-            "Priv\u00e9-gebruik goederen": {}, 
-            "Tegenrekening inkoop": {}, 
-            "Toev. Voorz. incour. grondst.": {}, 
-            "Toevoeging garantieverpl.": {}, 
-            "Toevoeging voorz. incour. handelsgoed.": {}, 
-            "Uitbesteed werk": {}, 
-            "Voorz. Incourourant grondst.": {}, 
-            "Voorz.incour. handelsgoed.": {}, 
-            "root_type": ""
-        }, 
-        "VOORRAAD GRONDSTOFFEN, HULPMATERIALEN EN HANDELSGOEDEREN": {
-            "Emballage": {
-                "account_type": "Cash"
-            }, 
-            "Gereed product 1": {
-                "account_type": "Cash"
-            }, 
-            "Gereed product 2": {
-                "account_type": "Cash"
-            }, 
-            "Goederen 1": {
-                "account_type": "Cash"
-            }, 
-            "Goederen 2": {
-                "account_type": "Cash"
-            }, 
-            "Goederen in consignatie": {
-                "account_type": "Cash"
-            }, 
-            "Goederen onderweg": {
-                "account_type": "Cash"
-            }, 
-            "Grondstoffen 1": {
-                "account_type": "Cash"
-            }, 
-            "Grondstoffen 2": {
-                "account_type": "Cash"
-            }, 
-            "Halffabrikaten 1": {
-                "account_type": "Cash"
-            }, 
-            "Halffabrikaten 2": {
-                "account_type": "Cash"
-            }, 
-            "Hulpstoffen 1": {
-                "account_type": "Cash"
-            }, 
-            "Hulpstoffen 2": {
-                "account_type": "Cash"
-            }, 
-            "Kantoorbenodigdheden": {
-                "account_type": "Cash"
-            }, 
-            "Onderhanden werk": {
-                "account_type": "Cash"
-            }, 
-            "Verpakkingsmateriaal": {
-                "account_type": "Cash"
-            }, 
-            "Zegels": {
-                "account_type": "Cash"
-            }, 
-            "root_type": ""
-        }
-    }
-}

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

@@ -1,6 +1,6 @@
 {
     "country_code": "de", 
-    "name": "Germany - Kontenplan SKR04", 
+    "name": "SKR04 ohne Kontonummern", 
     "tree": {
         "Bilanz - Aktiva": {
             "Anlageverm\u00f6gen": {
@@ -176,7 +176,7 @@
                         "Eingeforderte Nachsch\u00fcsse (gegenkonto 2929)": {}
                     }, 
                     "Eingeforderte- noch ausstehende Kapitaleinlagen": {
-                        "Ausstehende Einlagen auf das gezeichnete Kapital- eingefordert (Forderungen- nicht eingeforderte ausstehende Einlagen s. Konto 2910)": {}
+                        "Ausstehende Einlagen auf das gezeichnete Kapital- eingefordert": {}
                     }, 
                     "Forderungen aus Lieferungen und Leistungen H-Saldo": {
                         "Einzelwertberechtigungen zu Forderungen mit einer Restlaufzeit bis zu 1 Jahr": {}, 
@@ -685,7 +685,6 @@
                         "Umsatzsteuer aus innergemeinschaftlichem Erwerb 16%": {}, 
                         "Umsatzsteuer aus innergemeinschaftlichem Erwerb 19%": {}, 
                         "Umsatzsteuer aus innergemeinschaftlichem Erwerb ohne Vorsteuerabzug": {}, 
-                        "Umsatzsteuer aus innergemeinschaftlichem Erwerb von Neufahrzeugen von Lieferanten ohne Umsatzsteuer-Identifikationsnummer": {}, 
                         "Umsatzsteuer fr\u00fchere Jahre": {}, 
                         "Umsatzsteuer laufendes Jahr": {}, 
                         "Umsatzsteuer nach \u00a713b UStG": {}, 
@@ -747,7 +746,7 @@
                     "Verbindlichkeiten gegen\u00fcber Kreditinstituten ": {
                         "Gegenkonto 3159-3209 bei Aufteilung der Konten 3210-3248": {}
                     }, 
-                    "Verbindlichkeiten gegen\u00fcber Kreditinstituten oder Kassenbestand- Bundesbankguthaben- Guthaben bei Kreditinstituten und Schecks": {
+                    "Verbindlichkeiten gegen\u00fcber Kreditinstituten - Bundesbankguthaben- Guthaben bei Kreditinstituten und Schecks": {
                         "Verbindlichkeiten gegen\u00fcber Kreditinstituten  1": {
                             "(frei- in Bilanz kein Restlaufzeit vermerkt) 1": {}, 
                             "Verbindlichkeiten gegen\u00fcber Kreditinstituten Restlaufzeit 1 bis 5 Jahre": {}, 
@@ -778,8 +777,8 @@
         }, 
         "Gewinn u. Verlust - Aufwendungen": {
             "Betriebliche Aufwendungen": {
-                "Abschreibungen a. Verm\u00f6gensgeg.  d. Umlaufverm\u00f6gens- soweit diese die in der Kapitalgesellschaft \u00fcblichen Abschreibungen \u00fcberschreiten": {
-                    "Abschreibungen a. Verm\u00f6gensgeg. d. Umlaufverm\u00f6gens- soweit diese die in der Kapitalgesellschaft \u00fcblichen Abschreibungen \u00fcberschreiten": {
+                "Abschreibungen a. Verm\u00f6gensgeg. d.  Umlaufverm\u00f6gens- soweit diese die in der Abschreibungen \u00fcberschreiten": {
+                    "Abschreibungen a. Verm\u00f6gensgeg. d. Umlaufverm\u00f6gens- soweit diese die in der Abschreibungen \u00fcberschreiten": {
                         "Abschreibungen auf Umlaufverm\u00f6gen- steuerrechtlich bedingt (soweit un\u00fcblich hoch)": {}, 
                         "Abschreibungen auf Verm\u00f6gensgegenst\u00e4nde des Umlaufverm\u00f6gens (soweit un\u00fcblich hoch)": {}, 
                         "Forderungsverluste (soweit un\u00fcblich hoch)": {}, 
@@ -852,7 +851,7 @@
                 "Sonstige betriebliche Aufwendungen 3": {
                     "Sonstige betriebliche Aufwendungen 4": {
                         "Abgaben f\u00fcr betrieblich genutzten Grundbesitz": {}, 
-                        "Abgang von Wirtschaftsg\u00fctern des Umlaufverm\u00f6gens 100% / 50% nicht abzugsf\u00e4hig (inlandische Kap. Ges.) nach \u00a7 4 Abs. 3 Satz 4 EStG": {}, 
+                        "Abgang von Wirtschaftsg\u00fctern des Umlaufverm\u00f6gens 100% / 50% nicht abzugsf\u00e4hig (inlandische Kap. Ges.) nach": {}, 
                         "Abgang von Wirtschaftsg\u00fctern des Umlaufverm\u00f6gens nach \u00a7 4 Abs. 3 Satz 4 EStG": {}, 
                         "Abschluss- und Pr\u00fcfungskosten": {}, 
                         "Abschreibung auf Umlaufverm\u00f6gen au\u00dfer Vorr\u00e4te und Wertpapieren des UV (\u00fcbliche H\u00f6he)": {}, 
@@ -867,7 +866,7 @@
                         "Aufwendungen aus Anteilen an Kapitalgesellschaften 100% / 50% nicht abzugsf\u00e4hig (inlandische Kap. Ges.)": {}, 
                         "Aufwendungen aus Bewertung Finanzmittelfonds": {}, 
                         "Aufwendungen aus Kursdifferenzen": {}, 
-                        "Aufwendungen aus der Ver\u00e4u\u00dferung von Anteilen an Kapitalgesellschaften 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {}, 
+                        "Aufwendungen aus der Ver\u00e4u\u00dferung von Anteilen an Kapitalgesellschaften 100% / 50% nicht abzugsf\u00e4hig": {}, 
                         "Aufwendungen aus der Zuschreibung von steuertlich niedriger bewerteten R\u00fcckstellungen": {}, 
                         "Aufwendungen aus der Zuschreibung von steuertlich niedriger bewerteten Verbindlichkeiten": {}, 
                         "Aufwendungen f\u00fcr Abraum- und Abfallbeseitigung": {}, 
@@ -987,9 +986,9 @@
                         "Verg\u00fctungen an Mitunternehmer \u00a7 15 EStG": {}, 
                         "Verkaufsprovisionen": {}, 
                         "Verluste aus dem Abgang von Gegenst\u00e4nden des Anlageverm\u00f6gens": {}, 
-                        "Verluste aus dem Abgang von Gegenst\u00e4nden des Umlaufverm\u00f6gens (au\u00dfer Vorr\u00e4te) 100% / 50% nicht anzugsf\u00e4hig (inlandische Kap. Ges.)": {}, 
+                        "Verluste aus dem Abgang von Gegenst\u00e4nden des Umlaufverm\u00f6gens (au\u00dfer Vorr\u00e4te) 100%/50% nicht anzugsf\u00e4hig": {}, 
                         "Verluste aus dem Abgang von Gegenst\u00e4nden des Umlaufverm\u00f6gens au\u00dfer Vorr\u00e4te": {}, 
-                        "Verluste aus der Ver\u00e4u\u00dferung von Anteilen an Kapitalgesellschaften 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {}, 
+                        "Verluste aus der Ver\u00e4u\u00dferung von Anteilen an Kapitalgesellschaften 100% / 50% nicht abzugsf\u00e4hig": {}, 
                         "Verpackungsmaterial": {}, 
                         "Versicherungen": {}, 
                         "Versicherungen f\u00fcr Geb\u00e4ude": {}, 
@@ -1020,10 +1019,10 @@
                         }, 
                         "Abschreibungen auf Finanzanlagen 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {}, 
                         "Abschreibungen auf Finanzanlagen auf Grund steuerlicher Sondervorschriften": {}, 
-                        "Abschreibungen auf Finanzanlagen auf Grund steuerlicher Sondervorschriften 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {}, 
+                        "Abschreibungen auf Finanzanlagen auf Grund steuerlicher Sondervorschriften 100% / 50% nicht abzugsf\u00e4hig": {}, 
                         "Abschreibungen auf Grund von Verlustanteilen an Mitunternehmerschaften \u00a7 8 GewStG": {}, 
                         "Abschreibungen auf Wertpapiere des Umlaufverm\u00f6gens": {}, 
-                        "Abschreibungen auf Wertpapiere des Umlaufverm\u00f6gens 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {}, 
+                        "Abschreibungen auf Wertpapiere des Umlaufverm\u00f6gens 100% / 50% nicht abzugsf\u00e4hig": {}, 
                         "Vorwegnahme k\u00fcnftiger Wertschwankungen bei Wertpapieren des Umlaufverm\u00f6gens": {}
                     }, 
                     "account_type": "Depreciation"
@@ -1123,15 +1122,15 @@
                     }
                 }, 
                 "Erh\u00f6hung oder Verminderung des Bestands an fertigen und unfertige Erzeugnissen": {
-                    "Erh\u00f6hung des Bestands an fertigen und unfertigen Erzeugnissen oder Verminderung des Bestands an fertigen und unfertigen Erzeugnissen": {
+                    "Erh\u00f6hung / Verminderung des Bestands an fertigen und unfertigen Erzeugnissen": {
                         "Bestandsver\u00e4nderungen - fertige Erzeugnisse": {}, 
                         "Bestandsver\u00e4nderungen - unfertige Erzeugnisse": {}, 
                         "Bestandsver\u00e4nderungen - unfertige Leistungen": {}
                     }, 
-                    "Erh\u00f6hung des Bestands in Arbeit befindlicher Auftr\u00e4ge oder Verminderung des Bestands in Arbeit befindlicher Auftr\u00e4ge": {
+                    "Erh\u00f6hung / Verminderung des Bestands in Arbeit befindlicher Auftr\u00e4ge": {
                         "Bestandsver\u00e4nderungen in Arbeit befindlicher Auftr\u00e4ge": {}
                     }, 
-                    "Erh\u00f6hung des Bestands in Ausf\u00fchrung befindlicher Bauaftr\u00e4ge oder Verminderung des Bestands in Ausf\u00fchrung befindlicher Bauauftr\u00e4ge": {
+                    "Erh\u00f6hung / Verminderung des Bestands in Ausf\u00fchrung befindlicher Bauaftr\u00e4ge": {
                         "Bestandsver\u00e4nderungen in Ausf\u00fchrung befindliche Bauauftr\u00e4ge": {}
                     }
                 }, 
@@ -1384,8 +1383,7 @@
                     "Sonstige Zinsen und \u00e4hnliche Ertr\u00e4ge 1": {
                         "Diskontertr\u00e4ge": {}, 
                         "Diskontertr\u00e4ge aus verbundenen Unternehmen": {}, 
-                        "Laufende Ertr\u00e4ge aus Anteilen an Kapitalgesellschaften (Umlaufverm\u00f6gen) 100% / 50% steuerfrei (inl\u00e4ndische Kap. Ges.)": {}, 
-                        "Laufende Ertr\u00e4ge aus Anteilen an Kapitalgesellschaften (verbundene Unternehmen) 100% / 50% steuerfrei (inl\u00e4ndische Kap. Ges.)": {}, 
+                        "Laufende Ertr\u00e4ge aus Anteilen an Kapitalgesellschaften 100% / 50% steuerfrei": {},
                         "Sonstige Zinsen und \u00e4hnliche Ertr\u00e4ge 2": {}, 
                         "Sonstige Zinsen und \u00e4hnliche Ertr\u00e4ge aus verbundenen Unternehmen": {}, 
                         "Sonstige Zinsertr\u00e4ge": {}, 
@@ -1704,4 +1702,4 @@
             "root_type": "Asset"
         }
     }
-}
+}

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

@@ -1,6 +1,6 @@
 {
     "country_code": "fr", 
-    "name": "France - Plan Comptable G\u00e9n\u00e9ral", 
+    "name": "France - Plan Comptable General", 
     "tree": {
         "1-Comptes de Capitaux": {
             "10-Capital et R\u00e9serves": {
@@ -851,7 +851,7 @@
                     "4457-Taxes sur le chiffre d'affaires collect\u00e9es par l'entreprise": {
                         "44571-TVA collect\u00e9e": {
                             "account_type": "Tax", 
-                            "tax_rate": 20.0
+                            "is_group": 1
                         }, 
                         "44578-Taxes assimil\u00e9es \u00e0 la TVA": {}
                     }, 

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

@@ -2,7 +2,394 @@
     "country_code": "gt", 
     "name": "Guatemala - Cuentas", 
     "tree": {
-        "02 - Pasivos": {
+        "Activos": {
+            "Activo Corriente": {
+                "Activos Biol\u00f3gicos": {
+                    "Activos Biol\u00f3gicos a Valor Razonable": {
+                        "Animales": {
+                            "account_number": "1.5.2.1", 
+                            "account_type": "Stock", 
+                            "is_group": 1
+                        }, 
+                        "Plantas": {
+                            "account_number": "1.5.2.2", 
+                            "account_type": "Stock", 
+                            "is_group": 1
+                        }, 
+                        "account_number": "1.5.2", 
+                        "account_type": "Stock"
+                    }, 
+                    "Activos Biol\u00f3gicos al Costo": {
+                        "account_number": "1.5.1", 
+                        "account_type": "Stock", 
+                        "is_group": 1
+                    }, 
+                    "account_number": "1.5", 
+                    "account_type": "Stock"
+                }, 
+                "Activos Corrientes Adicionales": {
+                    "Activos Diferidos o Restringidos": {
+                        "Cr\u00e9dito Fiscal (IVA Por Cobrar)": {
+                            "account_number": "1.1.2.1", 
+                            "account_type": "Chargeable", 
+                            "is_group": 1
+                        }, 
+                        "account_number": "1.1.2", 
+                        "account_type": "Chargeable"
+                    }, 
+                    "Inversiones Corrientes no Clasificados como Equivalentes de Caja y Bancos": {
+                        "account_number": "1.1.1"
+                    }, 
+                    "account_number": "1.1", 
+                    "account_type": "Chargeable"
+                }, 
+                "Activos Devengables y Otros Activos": {
+                    "Activos Adicionales y Otros": {
+                        "account_number": "1.6.6", 
+                        "account_type": "Chargeable", 
+                        "is_group": 1
+                    }, 
+                    "Cobrables Relacionados con Impuestos": {
+                        "account_number": "1.6.2", 
+                        "account_type": "Chargeable", 
+                        "is_group": 1
+                    }, 
+                    "Contratos de Construccion": {
+                        "account_number": "1.6.4", 
+                        "account_type": "Chargeable", 
+                        "is_group": 1
+                    }, 
+                    "Costos de Montaje": {
+                        "account_number": "1.6.5", 
+                        "account_type": "Chargeable", 
+                        "is_group": 1
+                    }, 
+                    "Pagos Anticipados y Otros Activos Circulantes": {
+                        "Seguro Pagado Anticipadamente": {
+                            "account_number": "1.6.1.0", 
+                            "account_type": "Chargeable"
+                        }, 
+                        "account_number": "1.6.1", 
+                        "account_type": "Chargeable"
+                    }, 
+                    "Proveedores de Servicio": {
+                        "account_number": "1.6.3", 
+                        "account_type": "Chargeable", 
+                        "is_group": 1
+                    }, 
+                    "account_number": "1.6", 
+                    "account_type": "Chargeable"
+                }, 
+                "Activos Financieros": {
+                    "Activos Financieros Clasificados por Designaci\u00f3n": {
+                        "account_number": "1.4.6", 
+                        "account_type": "Chargeable", 
+                        "is_group": 1
+                    }, 
+                    "Activos Financieros Derivados": {
+                        "account_number": "1.4.3", 
+                        "account_type": "Chargeable", 
+                        "is_group": 1
+                    }, 
+                    "Inversion o Participaci\u00f3n Accionaria en Empresas Afiliadas": {
+                        "account_number": "1.4.1", 
+                        "account_type": "Chargeable", 
+                        "is_group": 1
+                    }, 
+                    "Inversiones Burs\u00e1tiles e Instrumentos Financieros": {
+                        "account_number": "1.4.2", 
+                        "account_type": "Chargeable", 
+                        "is_group": 1
+                    }, 
+                    "Otros Activos Financieros": {
+                        "account_number": "1.4.4", 
+                        "account_type": "Chargeable", 
+                        "is_group": 1
+                    }, 
+                    "Provisi\u00f3n por Riesgo de Cr\u00e9dito (agregado) (Contra-activo)": {
+                        "account_number": "1.4.5", 
+                        "account_type": "Round Off", 
+                        "is_group": 1
+                    }, 
+                    "account_number": "1.4", 
+                    "account_type": "Chargeable"
+                }, 
+                "Activos Intangibles": {
+                    "account_number": "1.3", 
+                    "account_type": "Chargeable", 
+                    "is_group": 1
+                }, 
+                "Caja y Equivalentes": {
+                    "Caja": {
+                        "account_number": "1.9.1", 
+                        "account_type": "Cash", 
+                        "is_group": 1
+                    }, 
+                    "Equivalentes de Efectivo (Bancos)": {
+                        "Bancos Internacionales": {
+                            "HSBC": {
+                                "account_number": "1.9.2.2.1", 
+                                "account_type": "Bank"
+                            }, 
+                            "account_number": "1.9.2.2", 
+                            "account_type": "Bank"
+                        }, 
+                        "Bancos Nacionales": {
+                            "Banco Agromercantil de Guatemala": {
+                                "account_number": "1.9.2.1.2", 
+                                "account_type": "Bank"
+                            }, 
+                            "Banco G&T Continental": {
+                                "account_number": "1.9.2.1.5", 
+                                "account_type": "Bank"
+                            }, 
+                            "Banco Industrial": {
+                                "account_number": "1.9.2.1.1", 
+                                "account_type": "Bank", 
+                                "is_group": 1
+                            }, 
+                            "Banco Internacional": {
+                                "account_number": "1.9.2.1.6", 
+                                "account_type": "Bank"
+                            }, 
+                            "Banco Prom\u00e9rica": {
+                                "account_number": "1.9.2.1.3", 
+                                "account_type": "Bank"
+                            }, 
+                            "Banco de Am\u00e9rica Central": {
+                                "account_number": "1.9.2.1.4", 
+                                "account_type": "Bank"
+                            }, 
+                            "Banco de Desarrollo Rural": {
+                                "account_number": "1.9.2.1.7", 
+                                "account_type": "Bank"
+                            }, 
+                            "Banco de los Trabajadores": {
+                                "account_number": "1.9.2.1.8", 
+                                "account_type": "Bank"
+                            }, 
+                            "Vivibanco": {
+                                "account_number": "1.9.2.1.9", 
+                                "account_type": "Bank"
+                            }, 
+                            "account_number": "1.9.2.1", 
+                            "account_type": "Bank"
+                        }, 
+                        "Cadena de Bloques (Blockchain)": {
+                            "Billetera Bitcoin 1234567890abcdefg": {
+                                "account_number": "1.9.2.3.1", 
+                                "account_type": "Cash"
+                            }, 
+                            "account_number": "1.9.2.3", 
+                            "account_type": "Cash"
+                        }, 
+                        "account_number": "1.9.2", 
+                        "account_type": "Bank"
+                    }, 
+                    "Inversiones a Corto Plazo": {
+                        "account_number": "1.9.3", 
+                        "account_type": "Bank", 
+                        "is_group": 1
+                    }, 
+                    "Otros Equivalentes de Caja y Bancos": {
+                        "account_number": "1.9.4", 
+                        "account_type": "Cash", 
+                        "is_group": 1
+                    }, 
+                    "account_number": "1.9", 
+                    "account_type": "Bank"
+                }, 
+                "Cobrables": {
+                    "Activos bajo Contrato": {
+                        "account_number": "1.8.2", 
+                        "account_type": "Receivable", 
+                        "is_group": 1
+                    }, 
+                    "Ajustes": {
+                        "account_number": "1.8.4", 
+                        "account_type": "Chargeable", 
+                        "is_group": 1
+                    }, 
+                    "Otras Cuentas por Cobrar": {
+                        "Cuentas Por Cobrar Compa\u00f1\u00edas Afiliadas": {
+                            "Compa\u00f1\u00eda subsidiaria (EJEMPLO)": {
+                                "account_number": "1.8.3.2.1", 
+                                "account_type": "Receivable"
+                            }, 
+                            "account_number": "1.8.3.2", 
+                            "account_type": "Receivable"
+                        }, 
+                        "Cuentas por Cobrar a Empleados": {
+                            "Prestamo EJEMPLO": {
+                                "account_number": "1.8.3.3.1", 
+                                "account_type": "Receivable"
+                            }, 
+                            "account_number": "1.8.3.3", 
+                            "account_type": "Receivable"
+                        }, 
+                        "Cuentas por Cobrar a Otras Entidades no Afiliadas": {
+                            "Compa\u00f1\u00eda No Afiliada (EJEMPLO)": {
+                                "account_number": "1.8.3.1.1", 
+                                "account_type": "Receivable"
+                            }, 
+                            "account_number": "1.8.3.1", 
+                            "account_type": "Receivable"
+                        }, 
+                        "account_number": "1.8.3", 
+                        "account_type": "Receivable"
+                    }, 
+                    "Ventas al Cr\u00e9dito": {
+                        "account_number": "1.8.1", 
+                        "account_type": "Receivable", 
+                        "is_group": 1
+                    }, 
+                    "account_number": "1.8", 
+                    "account_type": "Receivable"
+                }, 
+                "Impuestos por Cobrar": {
+                    "Retenciones de IVA recibidas": {}
+                }, 
+                "Inventario": {
+                    "Art\u00edculos de Inventario Adicionales": {
+                        "account_number": "1.7.8", 
+                        "account_type": "Stock", 
+                        "is_group": 1
+                    }, 
+                    "Combustibles": {
+                        "account_number": "1.7.5", 
+                        "account_type": "Stock", 
+                        "is_group": 1
+                    }, 
+                    "Inventarios Pignorados Como Garant\u00eda de Pasivo": {
+                        "account_number": "1.7.10", 
+                        "account_type": "Stock", 
+                        "is_group": 1
+                    }, 
+                    "Inventarios a Valor Razonable Menos Costos de Venta": {
+                        "account_number": "1.7.11", 
+                        "account_type": "Stock", 
+                        "is_group": 1
+                    }, 
+                    "Materia Prima": {
+                        "account_number": "1.7.1", 
+                        "account_type": "Stock", 
+                        "is_group": 1
+                    }, 
+                    "Mercader\u00eda (Mercanc\u00edas)": {
+                        "account_number": "1.7.2", 
+                        "account_type": "Stock", 
+                        "is_group": 1
+                    }, 
+                    "Otros Inventarios": {
+                        "Merma o Ajuste de Inventario": {
+                            "account_number": "1.7.9.1", 
+                            "account_type": "Stock Adjustment", 
+                            "is_group": 1
+                        }, 
+                        "account_number": "1.7.9", 
+                        "account_type": "Stock"
+                    }, 
+                    "Producto Terminado": {
+                        "account_number": "1.7.7", 
+                        "account_type": "Stock", 
+                        "is_group": 1
+                    }, 
+                    "Repuestos": {
+                        "Respuestos en Transito": {
+                            "account_number": "1.7.4.0", 
+                            "account_type": "Stock", 
+                            "is_group": 1
+                        }, 
+                        "account_number": "1.7.4", 
+                        "account_type": "Stock"
+                    }, 
+                    "Suministros de Producci\u00f3n y Consumibles": {
+                        "account_number": "1.7.3", 
+                        "account_type": "Stock", 
+                        "is_group": 1
+                    }, 
+                    "Trabajo en Progeso": {
+                        "account_number": "1.7.6", 
+                        "account_type": "Stock", 
+                        "is_group": 1
+                    }, 
+                    "account_number": "1.7", 
+                    "account_type": "Stock"
+                }, 
+                "Inversion en Propiedades": {
+                    "Inversion Inmobiliaria Bajo Construccion": {
+                        "account_number": "1.2.1", 
+                        "account_type": "Chargeable"
+                    }, 
+                    "Inversion Inmobiliaria Construida": {
+                        "account_number": "1.2.2", 
+                        "account_type": "Chargeable", 
+                        "is_group": 1
+                    }, 
+                    "account_number": "1.2", 
+                    "account_type": "Chargeable"
+                }, 
+                "account_number": "1.0"
+            }, 
+            "No Corriente": {
+                "Activos Fijos": {
+                    "account_type": "Fixed Asset"
+                }, 
+                "Cargos Diferidos": {}
+            }, 
+            "account_number": "1", 
+            "root_type": "Asset"
+        }, 
+        "Costos": {
+            "Costo de Ventas": {
+                "account_type": "Cost of Goods Sold"
+            }, 
+            "Costos Incluidos en la Valuaci\u00f3n": {
+                "account_type": "Expenses Included In Valuation"
+            }, 
+            "Merma o Ajuste de Inventario": {
+                "account_type": "Stock Adjustment"
+            }, 
+            "account_number": "5", 
+            "root_type": "Expense"
+        }, 
+        "Gastos": {
+            "Alquileres": {}, 
+            "Depreciaciones": {
+                "account_type": "Depreciation"
+            }, 
+            "Gastos Diversos": {}, 
+            "Gastos de Personal": {}, 
+            "Honorarios Profesionales": {}, 
+            "Mantenimiento": {}, 
+            "Seguros": {}, 
+            "Servicios B\u00e1sicos": {}, 
+            "account_number": "6", 
+            "root_type": "Expense"
+        }, 
+        "Ingresos": {
+            "Productos": {}, 
+            "Servicios": {}, 
+            "account_number": "4", 
+            "root_type": "Income"
+        }, 
+        "Otros Gastos y Productos Financieros": {
+            "Otros Gastos": {
+                "Otros Gastos y Productos Financieros 2": {
+                    "Intereses 1": {}, 
+                    "Otros Gastos Financieros 1": {}
+                }
+            }, 
+            "Otros Ingresos": {
+                "Otros Gastos y Productos Financieros 1": {
+                    "Intereses": {}, 
+                    "Otros Gastos Financieros": {}
+                }
+            }, 
+            "account_number": "7", 
+            "root_type": "Expense"
+        }, 
+        "Pasivos": {
             "Pasivo Corriente": {
                 "Acreedores 1": {
                     "account_type": "Payable"
@@ -22,329 +409,14 @@
                 "Acreedores": {}, 
                 "Provisi\u00f3n para Indemnizaciones": {}
             }, 
+            "account_number": "2", 
             "root_type": "Liability"
         }, 
-        "03 - Patrimonio": {
+        "Patrimonio": {
             "Capital": {}, 
             "Resultados del Ejercicio": {}, 
             "Utilidades Retenidas": {}, 
-            "root_type": "Asset"
-        }, 
-        "04 - Ingresos": {
-            "Productos": {}, 
-            "Servicios": {}, 
-            "root_type": "Income"
-        }, 
-        "05 - Costos": {
-            "Costo de Ventas": {
-                "account_type": "Cost of Goods Sold"
-            }, 
-            "Costos Incluidos en la Valuaci\u00f3n": {
-                "account_type": "Expenses Included In Valuation"
-            }, 
-            "Merma o Ajuste de Inventario": {
-                "account_type": "Stock Adjustment"
-            }, 
-            "root_type": "Expense"
-        }, 
-        "06 - Gastos": {
-            "Alquileres": {}, 
-            "Depreciaciones": {
-                "account_type": "Depreciation"
-            }, 
-            "Gastos Diversos": {}, 
-            "Gastos de Personal": {}, 
-            "Honorarios Profesionales": {}, 
-            "Mantenimiento": {}, 
-            "Seguros": {}, 
-            "Servicios B\u00e1sicos": {}, 
-            "root_type": "Expense"
-        }, 
-        "07 - Otros Gastos y Productos Financieros": {
-            "Otros Gastos": {
-                "Otros Gastos y Productos Financieros 2": {
-                    "Intereses 1": {}, 
-                    "Otros Gastos Financieros 1": {}
-                }
-            }, 
-            "Otros Ingresos": {
-                "Otros Gastos y Productos Financieros 1": {
-                    "Intereses": {}, 
-                    "Otros Gastos Financieros": {}
-                }
-            }, 
-            "root_type": "Expense"
-        }, 
-        "1 - Activos": {
-            "1. Activo Corriente": {
-                "1.10 Activos Corrientes Adicionales": {
-                    "1.10.1 Inversiones Corrientes no Clasificados como Equivalentes de Caja y Bancos": {}, 
-                    "1.10.2 Activos Diferidos o Restringidos": {
-                        "1.10.2.1 Cr\u00e9dito Fiscal (IVA Por Cobrar)": {
-                            "account_type": "Chargeable", 
-                            "is_group": 1
-                        }, 
-                        "account_type": "Chargeable"
-                    }, 
-                    "account_type": "Chargeable"
-                }, 
-                "1.2 Inversion en Propiedades": {
-                    "1.2.1 Inversion Inmobiliaria Bajo Construccion": {
-                        "account_type": "Chargeable"
-                    }, 
-                    "1.2.2 Inversion Inmobiliaria Construida": {
-                        "account_type": "Chargeable", 
-                        "is_group": 1
-                    }, 
-                    "account_type": "Chargeable"
-                }, 
-                "1.3 Activos Intangibles": {
-                    "account_type": "Chargeable", 
-                    "is_group": 1
-                }, 
-                "1.4 Activos Financieros": {
-                    "1.4.1 Inversion o Participaci\u00f3n Accionaria en Empresas Afiliadas": {
-                        "account_type": "Chargeable", 
-                        "is_group": 1
-                    }, 
-                    "1.4.2 Inversiones Burs\u00e1tiles e Instrumentos Financieros": {
-                        "account_type": "Chargeable", 
-                        "is_group": 1
-                    }, 
-                    "1.4.3 Activos Financieros Derivados": {
-                        "account_type": "Chargeable", 
-                        "is_group": 1
-                    }, 
-                    "1.4.4 Otros Activos Financieros": {
-                        "account_type": "Chargeable", 
-                        "is_group": 1
-                    }, 
-                    "1.4.5 Provisi\u00f3n por Riesgo de Cr\u00e9dito (agregado) (Contra-activo)": {
-                        "account_type": "Round Off", 
-                        "is_group": 1
-                    }, 
-                    "1.4.6 Activos Financieros Clasificados por Designaci\u00f3n": {
-                        "account_type": "Chargeable", 
-                        "is_group": 1
-                    }, 
-                    "account_type": "Chargeable"
-                }, 
-                "1.5 Activos Biol\u00f3gicos": {
-                    "1.5.1 Activos Biol\u00f3gicos al Costo": {
-                        "account_type": "Stock", 
-                        "is_group": 1
-                    }, 
-                    "1.5.2 Activos Biol\u00f3gicos a Valor Razonable": {
-                        "1.5.2.1 Animales": {
-                            "account_type": "Stock", 
-                            "is_group": 1
-                        }, 
-                        "1.5.2.2 Plantas": {
-                            "1.5.2.2.1 Division productiva 1er nivel EJEMPLO": {
-                                "1.5.2.2.1.1 Division Productiva 2do nivel EJEMPLO": {
-                                    "1.5.2.2.1.1.1 Division Productiva 3er Nivel EJEMPLO": {
-                                        "1.5.2.2.1.1.1.1 Divisi\u00f3n Productiva 4\u00ba Nivel EJEMPLO": {}, 
-                                        "account_type": "Stock"
-                                    }, 
-                                    "account_type": "Stock"
-                                }, 
-                                "account_type": "Stock"
-                            }, 
-                            "account_type": "Stock"
-                        }, 
-                        "account_type": "Stock"
-                    }, 
-                    "account_type": "Stock"
-                }, 
-                "1.6 Activos Devengables y Otros Activos": {
-                    "1.6.1 Pagos Anticipados y Otros Activos Circulantes": {
-                        "1.6.1.0 Seguro Pagado Anticipadamente": {
-                            "account_type": "Chargeable"
-                        }, 
-                        "account_type": "Chargeable"
-                    }, 
-                    "1.6.2 Cobrables Relacionados con Impuestos": {
-                        "account_type": "Chargeable", 
-                        "is_group": 1
-                    }, 
-                    "1.6.3 Proveedores de Servicio": {
-                        "account_type": "Chargeable", 
-                        "is_group": 1
-                    }, 
-                    "1.6.4 Contratos de Construccion": {
-                        "account_type": "Chargeable", 
-                        "is_group": 1
-                    }, 
-                    "1.6.5 Costos de Montaje": {
-                        "account_type": "Chargeable", 
-                        "is_group": 1
-                    }, 
-                    "1.6.6 Activos Adicionales y Otros": {
-                        "account_type": "Chargeable", 
-                        "is_group": 1
-                    }, 
-                    "account_type": "Chargeable"
-                }, 
-                "1.7 Inventario": {
-                    "1.7.1 Materia Prima": {
-                        "account_type": "Stock", 
-                        "is_group": 1
-                    }, 
-                    "1.7.10 Inventarios Pignorados Como Garant\u00eda de Pasivo": {
-                        "account_type": "Stock", 
-                        "is_group": 1
-                    }, 
-                    "1.7.11 Inventarios a Valor Razonable Menos Costos de Venta": {
-                        "account_type": "Stock", 
-                        "is_group": 1
-                    }, 
-                    "1.7.2 Mercader\u00eda (Mercanc\u00edas)": {
-                        "account_type": "Stock", 
-                        "is_group": 1
-                    }, 
-                    "1.7.3 Suministros de Producci\u00f3n y Consumibles": {
-                        "account_type": "Stock", 
-                        "is_group": 1
-                    }, 
-                    "1.7.4 Repuestos": {
-                        "1.7.4.0 Respuestos en Transito": {
-                            "account_type": "Stock", 
-                            "is_group": 1
-                        }, 
-                        "account_type": "Stock"
-                    }, 
-                    "1.7.5 Combustibles": {
-                        "account_type": "Stock", 
-                        "is_group": 1
-                    }, 
-                    "1.7.6 Trabajo en Progeso": {
-                        "account_type": "Stock", 
-                        "is_group": 1
-                    }, 
-                    "1.7.7 Producto Terminado": {
-                        "account_type": "Stock", 
-                        "is_group": 1
-                    }, 
-                    "1.7.8 Art\u00edculos de Inventario Adicionales": {
-                        "account_type": "Stock", 
-                        "is_group": 1
-                    }, 
-                    "1.7.9 Otros Inventarios": {
-                        "1.7.9.1 Merma o Ajuste de Inventario": {
-                            "account_type": "Stock Adjustment", 
-                            "is_group": 1
-                        }, 
-                        "account_type": "Stock"
-                    }, 
-                    "account_type": "Stock"
-                }, 
-                "1.8 Cobrables": {
-                    "1.8.1 Ventas al Cr\u00e9dito": {
-                        "account_type": "Receivable", 
-                        "is_group": 1
-                    }, 
-                    "1.8.2 Activos bajo Contrato": {
-                        "account_type": "Receivable", 
-                        "is_group": 1
-                    }, 
-                    "1.8.3 Otras Cuentas por Cobrar": {
-                        "1.8.3.1 Cuentas por Cobrar a Otras Entidades no Afiliadas": {
-                            "1.8.3.1.1 Compa\u00f1\u00eda No Afiliada (EJEMPLO)": {
-                                "account_type": "Receivable"
-                            }, 
-                            "account_type": "Receivable"
-                        }, 
-                        "1.8.3.2 Cuentas Por Cobrar Compa\u00f1\u00edas Afiliadas": {
-                            "1.8.3.2.1 Compa\u00f1\u00eda subsidiaria (EJEMPLO)": {
-                                "account_type": "Receivable"
-                            }, 
-                            "account_type": "Receivable"
-                        }, 
-                        "1.8.3.3 Cuentas por Cobrar a Empleados": {
-                            "1.8.3.3.1 Prestamo EJEMPLO": {
-                                "account_type": "Receivable"
-                            }, 
-                            "account_type": "Receivable"
-                        }, 
-                        "account_type": "Receivable"
-                    }, 
-                    "1.8.4 Ajustes": {
-                        "account_type": "Chargeable", 
-                        "is_group": 1
-                    }, 
-                    "account_type": "Receivable"
-                }, 
-                "1.9 Caja y Equivalentes": {
-                    "1.9.1 Caja": {
-                        "account_type": "Cash", 
-                        "is_group": 1
-                    }, 
-                    "1.9.2 Equivalentes de Efectivo (Bancos)": {
-                        "1.9.2.1 Bancos Nacionales": {
-                            "1.9.2.1.1 Banco Industrial": {
-                                "account_type": "Bank", 
-                                "is_group": 1
-                            }, 
-                            "1.9.2.1.2 Banco Agromercantil de Guatemala": {
-                                "account_type": "Bank"
-                            }, 
-                            "1.9.2.1.3 Banco Prom\u00e9rica": {
-                                "account_type": "Bank"
-                            }, 
-                            "1.9.2.1.4 Banco de Am\u00e9rica Central": {
-                                "account_type": "Bank"
-                            }, 
-                            "1.9.2.1.5 Banco G&T Continental": {
-                                "account_type": "Bank"
-                            }, 
-                            "1.9.2.1.6 Banco Internacional": {
-                                "account_type": "Bank"
-                            }, 
-                            "1.9.2.1.7 Banco de Desarrollo Rural": {
-                                "account_type": "Bank"
-                            }, 
-                            "1.9.2.1.8 Banco de los Trabajadores": {
-                                "account_type": "Bank"
-                            }, 
-                            "1.9.2.1.9 Vivibanco": {
-                                "account_type": "Bank"
-                            }, 
-                            "account_type": "Bank"
-                        }, 
-                        "1.9.2.2 Bancos Internacionales": {
-                            "1.9.2.2.1 HSBC": {
-                                "account_type": "Bank"
-                            }, 
-                            "account_type": "Bank"
-                        }, 
-                        "1.9.2.3 Cadena de Bloques (Blockchain)": {
-                            "1.9.2.3.1 Billetera Bitcoin 1234567890abcdefg": {
-                                "account_type": "Cash"
-                            }, 
-                            "account_type": "Cash"
-                        }, 
-                        "account_type": "Bank"
-                    }, 
-                    "1.9.3 Inversiones a Corto Plazo": {
-                        "account_type": "Bank", 
-                        "is_group": 1
-                    }, 
-                    "1.9.4 Otros Equivalentes de Caja y Bancos": {
-                        "account_type": "Cash", 
-                        "is_group": 1
-                    }, 
-                    "account_type": "Bank"
-                }, 
-                "Impuestos por Cobrar": {
-                    "Retenciones de IVA recibidas": {}
-                }
-            }, 
-            "No Corriente": {
-                "Activos Fijos": {
-                    "account_type": "Fixed Asset"
-                }, 
-                "Cargos Diferidos": {}
-            }, 
+            "account_number": "3", 
             "root_type": "Asset"
         }
     }

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

@@ -527,7 +527,7 @@
 			"root_type": "Liability"
 		}, 
 		"5. SZ\u00c1MLAOSZT\u00c1LY K\u00d6LTS\u00c9GNEMEK": {
-			"51 - 53 ANYAGJELLEG\u00db R\u00c1FORD\u00cdT\u00c1SOK ": {
+			"51 - 53. ANYAGJELLEG\u00db R\u00c1FORD\u00cdT\u00c1SOK ": {
 				"51. ANYAGK\u00d6LTS\u00c9G": {
 					"511. V\u00e1s\u00e1rolt anyagok k\u00f6lts\u00e9gei ": {
 						"5111. Alapanyag k\u00f6lts\u00e9gek": {}, 
@@ -588,7 +588,6 @@
 						"5592. Munk\u00e1ltat\u00f3 \u00e1ltal \u00f6nk\u00e9ntes p\u00e9nzt\u00e1rba befizetett munk\u00e1ltat\u00f3i tagd\u00edj hozz\u00e1j\u00e1rul\u00e1s": {}, 
 						"5593. Munk\u00e1ltat\u00f3t terhel\u0151 szem\u00e9lyi j\u00f6vedelemad\u00f3": {}, 
 						"5594. Munk\u00e1ltat\u00f3i hozz\u00e1j\u00e1rul\u00e1s a korengedm\u00e9nyes nyugd\u00edj ig\u00e9nybev\u00e9tel\u00e9hez": {}, 
-						"5595. Tal\u00e1lm\u00e1nyi d\u00edj, szabadalom v\u00e9tel\u00e1ra \u00e9s hasznos\u00edt\u00e1si d\u00edja, az \u00faj\u00edt\u00e1si d\u00edj \u00e9s ezekkel kapcsolatos k\u00f6zrem\u0171k\u00f6d\u00e9si d\u00edjak": {}, 
 						"5596. Fizetett szerz\u0151i, \u00edr\u00f3i \u00e9s m\u00e1s jogv\u00e9delmet \u00e9lvez\u0151 munk\u00e1k d\u00edjai \u00e9s ezekkel kapcsolatos k\u00f6zrem\u0171k\u00f6d\u0151i d\u00edjak": {}, 
 						"5597. Fizetett \u00f6szt\u00f6nd\u00edjak": {}, 
 						"5598. Reprezent\u00e1ci\u00f3s k\u00f6lts\u00e9gek, \u00e9tkez\u00e9si hozz\u00e1j\u00e1rul\u00e1s": {}, 
@@ -618,23 +617,8 @@
 				"581. Saj\u00e1t termel\u00e9s\u0171 k\u00e9szletek \u00e1llom\u00e1nyv\u00e1ltoz\u00e1sa ": {}, 
 				"582. Saj\u00e1t el\u0151\u00e1ll\u00edt\u00e1s\u00fa eszk\u00f6z\u00f6k aktiv\u00e1lt \u00e9rt\u00e9ke": {}, 
 				"589. Aktiv\u00e1lt saj\u00e1t teljes\u00edtm\u00e9nyek \u00e1tvezet\u00e9si sz\u00e1mla": {}
-			}, 
-			"59. K\u00d6LTS\u00c9GNEM ELLENSZ\u00c1MLA  (els\u0151dleges k\u00f6lts\u00e9ghely-k\u00f6lts\u00e9gvisel\u0151 elsz\u00e1mol\u00f3s eset\u00e9n) ": {
-				"is_group": 1
-			}, 
-			"59. K\u00d6LTS\u00c9GNEM \u00c1TVEZET\u00c9SI SZ\u00c1MLA  (els\u0151dleges k\u00f6lts\u00e9gnem-elsz\u00e1mol\u00e1s eset\u00e9n)": {
-				"is_group": 1
-			}, 
-			"59. K\u00d6LTS\u00c9GNEM \u00c1TVEZET\u00c9SI SZ\u00c1MLA  (els\u0151dleges k\u00f6lts\u00e9gnem-elsz\u00e1mol\u00e1s eset\u00e9n, kiz\u00e1r\u00f3lag \u00f6sszk\u00f6lts\u00e9g elj\u00e1r\u00e1ssal)": {
-				"59/51. Anyagk\u00f6lts\u00e9g \u00e1tvezet\u00e9si sz\u00e1mla": {}, 
-				"59/52. Ig\u00e9nybe vett szolg\u00e1ltat\u00e1sok k\u00f6lts\u00e9gei \u00e1tvezet\u00e9si sz\u00e1mla ": {}, 
-				"59/53. Egy\u00e9b szolg\u00e1ltat\u00e1sok k\u00f6lts\u00e9gei \u00e1tvezet\u00e9si sz\u00e1mla ": {}, 
-				"59/54. B\u00e9rk\u00f6lts\u00e9g \u00e1tvezet\u00e9si sz\u00e1mla": {}, 
-				"59/55. Szem\u00e9lyi jelleg\u0171 egy\u00e9b kifizet\u00e9sek \u00e1tvezet\u00e9si sz\u00e1mla ": {}, 
-				"59/56. B\u00e9rj\u00e1rul\u00e9kok \u00e1tvezet\u00e9si sz\u00e1mla": {}, 
-				"59/57. \u00c9rt\u00e9kcs\u00f6kken\u00e9si le\u00edr\u00e1s \u00e1tvezet\u00e9si sz\u00e1mla ": {}
-			}, 
-			"59. K\u00d6LTS\u00c9GNEM \u00c1TVEZET\u00c9SI SZ\u00c1MLA  (kiz\u00e1r\u00f3lag k\u00f6lts\u00e9gnem-elsz\u00e1mol\u00e1s \u00e9s forgalmi k\u00f6lts\u00e9g elj\u00e1r\u00e1ssal)": {
+			},
+			"59. K\u00d6LTS\u00c9GNEM \u00c1TVEZET\u00c9SI SZ\u00c1MLA": {
 				"is_group": 1
 			}, 
 			"root_type": "Expense"
@@ -746,7 +730,7 @@
 					"8684. K\u00f6vetel\u00e9sek \u00e9rt\u00e9kveszt\u00e9se": {}
 				}, 
 				"869. K\u00fcl\u00f6nf\u00e9le egy\u00e9b r\u00e1ford\u00edt\u00e1sok": {
-					"8691. T\u00e1rsas\u00e1gba bevitt, \u00e9rt\u00e9kpap\u00edrnak vagy r\u00e9szesed\u00e9snek nem min\u0151s\u00fcl\u0151 vagyont. k\u00f6nyv szerinti \u00e9s l\u00e9t. okir. meghat. veszt. k\u00fcl\u00f6nb\u00f6zet": {}, 
+					"8691. T\u00e1rsas\u00e1gba bevitt, \u00e9rt\u00e9kpap\u00edrnak vagy r\u00e9szesed\u00e9snek nem min\u0151s\u00fcl\u0151 vagyont.": {}, 
 					"8692. Ellent\u00e9telez\u00e9s n\u00e9lk\u00fcl \u00e1tv\u00e1llalt k\u00f6telezetts\u00e9g szerz\u0151d\u00e9s szerinti \u00f6sszege": {}, 
 					"8693. T\u00e9r\u00edt\u00e9s n\u00e9lk\u00fcl \u00e1tadott, r\u00e9szesed\u00e9snek vagy \u00e9rt\u00e9kpap\u00edrnak nem min\u0151s\u00fcl\u0151 eszk\u00f6z\u00f6k nyilv\u00e1ntart\u00e1s szerinti \u00e9rt\u00e9ke": {}, 
 					"8694. T\u00e9r\u00edt\u00e9s n\u00e9lk\u00fcl ny\u00fajtott szolg\u00e1ltat\u00e1sok beker\u00fcl\u00e9si \u00e9rt\u00e9ke": {}, 
@@ -828,12 +812,7 @@
 					"9684. R\u00e9szesed\u00e9sek \u00e9rt\u00e9kveszt\u00e9s\u00e9nek vissza\u00edr\u00e1sa": {}
 				}, 
 				"969. K\u00fcl\u00f6nf\u00e9le egy\u00e9b bev\u00e9telek": {
-					"9691. Gazdas\u00e1gi t\u00e1rsas\u00e1gba bevitt, \u00e9rt\u00e9kp. vagy r\u00e9szesed\u00e9snek nem min\u0151s\u00fcl\u0151 vagyont. \u00e9rt\u00e9ke \u00e9s l\u00e9tes\u00edt\u0151 okir. \u00e9rt. nyer. jell . k\u00fcl\u00f6nb.": {}, 
-					"9692. El\u00e9v\u00fclt k\u00f6telezetts\u00e9g k\u00f6nyv szerinti \u00e9rt\u00e9ke": {}, 
-					"9693. T\u00e9r\u00edt\u00e9s n\u00e9lk\u00fcl \u00e1tvett, aj\u00e1nd\u00e9kk\u00e9nt, hagyat\u00e9kk\u00e9nt kapott, fellelt eszk\u00f6z\u00f6k piaci vagy jogszab\u00e1ly szerinti \u00e9rt\u00e9ke": {}, 
-					"9694. T\u00e9r\u00edt\u00e9s n\u00e9lk\u00fcl kapott szolg\u00e1ltat\u00e1sok piaci vagy jogszab\u00e1ly szerinti \u00e9rt\u00e9ke": {}, 
-					"9695. Elengedett \u00e9s ellent\u00e9telez\u00e9s n\u00e9lk\u00fcl \u00e1tv\u00e1llalt k\u00f6telezetts\u00e9g \u00e9rt\u00e9ke": {}, 
-					"9696. Egy\u00e9b, vagyonn\u00f6veked\u00e9ssel j\u00e1r\u00f3 bev\u00e9telek": {}
+					"is_group": 1
 				}
 			}, 
 			"97. P\u00c9NZ\u00dcGYI M\u0170VELETEK BEV\u00c9TELEI": {

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

@@ -2,160 +2,162 @@
     "country_code": "in",
     "name": "India - Chart of Accounts",
     "tree": {
-	    "Application of Funds (Assets)": {
-	        "Current Assets": {
-	            "Accounts Receivable": {
-	                "Debtors": {
-	                    "account_type": "Receivable"
-	                }
-	            },
-	            "Bank Accounts": {
-	                "account_type": "Bank",
-					"is_group": 1
-	            },
-	            "Cash In Hand": {
-	                "Cash": {
-	                    "account_type": "Cash"
-	                },
-	                "account_type": "Cash"
-	            },
-	            "Loans and Advances (Assets)": {
-	            	"is_group": 1
-	            },
-	            "Securities and Deposits": {
-	                "Earnest Money": {}
-	            },
-	            "Stock Assets": {
-					"Stock in Hand": {
-		                "account_type": "Stock"							
-					}
-	            },
-	            "Tax Assets": {
-					"is_group": 1
-				}
-	        },
-	        "Fixed Assets": {
-	            "Capital Equipments": {
-	                "account_type": "Fixed Asset"
-	            },
-	            "Electronic Equipments": {
-	                "account_type": "Fixed Asset"
-	            },
-	            "Furnitures and Fixtures": {
-	                "account_type": "Fixed Asset"
-	            },
-	            "Office Equipments": {
-	                "account_type": "Fixed Asset"
-	            },
-	            "Plants and Machineries": {
-	                "account_type": "Fixed Asset"
-	            },
-				"Buildings": {
-					"account_type": "Fixed Asset"
-				},
-				"Accumulated Depreciations": {
-					"account_type": "Accumulated Depreciation"
-				}
-	        },
-	        "Investments": {
-	        	"is_group": 1
-	        },
-	        "Temporary Accounts": {
-	            "Temporary Opening": {
-	            	"account_type": "Temporary"
-	            }
-	        },
-			"root_type": "Asset"
-	    },
-	    "Expenses": {
-	        "Direct Expenses": {
-	            "Stock Expenses": {
-	                "Cost of Goods Sold": {
-	                    "account_type": "Cost of Goods Sold"
-	                },
-	                "Expenses Included In Valuation": {
-	                    "account_type": "Expenses Included In Valuation"
-	                },
-	                "Stock Adjustment": {
-	                    "account_type": "Stock Adjustment"
-	                }
-	            }
-	        },
-	        "Indirect Expenses": {
-	            "Administrative Expenses": {},
-	            "Commission on Sales": {},
-	            "Depreciation": {
-	                "account_type": "Depreciation"
-	            },
-	            "Entertainment Expenses": {},
-	            "Freight and Forwarding Charges": {
-	                "account_type": "Chargeable"
-	            },
-	            "Legal Expenses": {},
-	            "Marketing Expenses": {},
-	            "Miscellaneous Expenses": {},
-	            "Office Maintenance Expenses": {},
-	            "Office Rent": {},
-	            "Postal Expenses": {},
-	            "Print and Stationary": {},
-	            "Rounded Off": {
-	                "account_type": "Round Off"
-	            },
-	            "Salary": {},
-	            "Sales Expenses": {},
-	            "Telephone Expenses": {},
-	            "Travel Expenses": {},
-	            "Utility Expenses": {},
-				"Write Off": {},
-				"Exchange Gain/Loss": {},
-				"Gain/Loss on Asset Disposal": {}
-	        },
-			"root_type": "Expense"
-	    },
-	    "Income": {
-	        "Direct Income": {
-	            "Sales": {
-	                "account_type": "Income Account"
-	            },
-	            "Service": {
-	                "account_type": "Income Account"
-	            },
-	            "account_type": "Income Account"
-	        },
-	        "Indirect Income": {
-	            "account_type": "Income Account",
-				"is_group": 1
-	        },
-			"root_type": "Income"
-	    },
-	    "Source of Funds (Liabilities)": {
-	        "Capital Account": {
-	            "Reserves and Surplus": {},
-	            "Shareholders Funds": {}
-	        },
-	        "Current Liabilities": {
-			    "Accounts Payable": {
-			        "Creditors": {
-			            "account_type": "Payable"
-			        },
-					"Payroll Payable": {}
-			    },
-			    "Stock Liabilities": {
-				    "Stock Received But Not Billed": {
-				        "account_type": "Stock Received But Not Billed"
-				    }
-			    },
-				"Duties and Taxes": {
-					"account_type": "Tax",
-					"is_group": 1
-				},
-				"Loans (Liabilities)": {
-					"Secured Loans": {},
-					"Unsecured Loans": {},
-					"Bank Overdraft Account": {}
-				}
-	        },
-			"root_type": "Liability"
-		}
-	}
+        "Application of Funds (Assets)": {
+            "Current Assets": {
+                "Accounts Receivable": {
+                    "Debtors": {
+                        "account_type": "Receivable"
+                    }
+                },
+                "Bank Accounts": {
+                    "account_type": "Bank",
+                    "is_group": 1
+                },
+                "Cash In Hand": {
+                    "Cash": {
+                        "account_type": "Cash"
+                    },
+                    "account_type": "Cash"
+                },
+                "Loans and Advances (Assets)": {
+                    "is_group": 1
+                },
+                "Securities and Deposits": {
+                    "Earnest Money": {}
+                },
+                "Stock Assets": {
+                    "Stock In Hand": {
+                        "account_type": "Stock"
+                    },
+                    "account_type": "Stock"
+                },
+                "Tax Assets": {
+                    "is_group": 1
+                }
+            },
+            "Fixed Assets": {
+                "Capital Equipments": {
+                    "account_type": "Fixed Asset"
+                },
+                "Electronic Equipments": {
+                    "account_type": "Fixed Asset"
+                },
+                "Furnitures and Fixtures": {
+                    "account_type": "Fixed Asset"
+                },
+                "Office Equipments": {
+                    "account_type": "Fixed Asset"
+                },
+                "Plants and Machineries": {
+                    "account_type": "Fixed Asset"
+                },
+                "Buildings": {
+                    "account_type": "Fixed Asset"
+                },
+                "Accumulated Depreciations": {
+                    "account_type": "Accumulated Depreciation"
+                }
+            },
+            "Investments": {
+                "is_group": 1
+            },
+            "Temporary Accounts": {
+                "Temporary Opening": {
+                    "account_type": "Temporary"
+                }
+            },
+            "root_type": "Asset"
+        },
+        "Expenses": {
+            "Direct Expenses": {
+                "Stock Expenses": {
+                    "Cost of Goods Sold": {
+                        "account_type": "Cost of Goods Sold"
+                    },
+                    "Expenses Included In Valuation": {
+                        "account_type": "Expenses Included In Valuation"
+                    },
+                    "Stock Adjustment": {
+                        "account_type": "Stock Adjustment"
+                    }
+                }
+            },
+            "Indirect Expenses": {
+                "Administrative Expenses": {},
+                "Commission on Sales": {},
+                "Depreciation": {
+                    "account_type": "Depreciation"
+                },
+                "Entertainment Expenses": {},
+                "Freight and Forwarding Charges": {
+                    "account_type": "Chargeable"
+                },
+                "Legal Expenses": {},
+                "Marketing Expenses": {},
+                "Miscellaneous Expenses": {},
+                "Office Maintenance Expenses": {},
+                "Office Rent": {},
+                "Postal Expenses": {},
+                "Print and Stationary": {},
+                "Rounded Off": {
+                    "account_type": "Round Off"
+                },
+                "Salary": {},
+                "Sales Expenses": {},
+                "Telephone Expenses": {},
+                "Travel Expenses": {},
+                "Utility Expenses": {},
+                "Write Off": {},
+                "Exchange Gain/Loss": {},
+                "Gain/Loss on Asset Disposal": {}
+            },
+            "root_type": "Expense"
+        },
+        "Income": {
+            "Direct Income": {
+                "Sales": {
+                    "account_type": "Income Account"
+                },
+                "Service": {
+                    "account_type": "Income Account"
+                },
+                "account_type": "Income Account"
+            },
+            "Indirect Income": {
+                "account_type": "Income Account",
+                "is_group": 1
+            },
+            "root_type": "Income"
+        },
+        "Source of Funds (Liabilities)": {
+            "Capital Account": {
+                "Reserves and Surplus": {},
+                "Shareholders Funds": {}
+            },
+            "Current Liabilities": {
+                "Accounts Payable": {
+                    "Creditors": {
+                        "account_type": "Payable"
+                    },
+                    "Payroll Payable": {}
+                },
+                "Stock Liabilities": {
+                    "Stock Received But Not Billed": {
+                        "account_type": "Stock Received But Not Billed"
+                    }
+                },
+                "Duties and Taxes": {
+                    "TDS": {
+                        "account_type": "Tax"
+                    }
+                },
+                "Loans (Liabilities)": {
+                    "Secured Loans": {},
+                    "Unsecured Loans": {},
+                    "Bank Overdraft Account": {}
+                }
+            },
+            "root_type": "Liability"
+        }
+    }
 }

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

@@ -24,7 +24,8 @@ def get():
 	                "account_type": "Cash"
 	            },
 	            _("Loans and Advances (Assets)"): {
-	            	"is_group": 1
+                    	_("Employee Advances"): {
+                    	},
 	            },
 	            _("Securities and Deposits"): {
 	                _("Earnest Money"): {}
@@ -63,7 +64,10 @@ def get():
 				},
 	            _("Accumulated Depreciation"): {
 	            	"account_type": "Accumulated Depreciation"
-	            }
+	            },
+                _("CWIP Account"): {
+                    "account_type": "Capital Work in Progress",
+                }
 	        },
 	        _("Investments"): {
 	        	"is_group": 1
@@ -81,6 +85,9 @@ def get():
 	                _("Cost of Goods Sold"): {
 	                    "account_type": "Cost of Goods Sold"
 	                },
+                    _("Expenses Included In Asset Valuation"): {
+                        "account_type": "Expenses Included In Asset Valuation"
+                    },
 	                _("Expenses Included In Valuation"): {
 	                    "account_type": "Expenses Included In Valuation"
 	                },
@@ -146,6 +153,9 @@ def get():
 				    _("Stock Received But Not Billed"): {
 				        "account_type": "Stock Received But Not Billed"
 				    },
+                    _("Asset Received But Not Billed"): {
+                        "account_type": "Asset Received But Not Billed"
+                    }
 			    },
 				_("Duties and Taxes"): {
 					"account_type": "Tax",

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

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

erpnext/accounts/doctype/account/test_account.py

@@ -2,9 +2,113 @@
 # License: GNU General Public License v3. See license.txt
 
 from __future__ import unicode_literals
+import unittest
 import frappe
 from erpnext.stock import get_warehouse_account, get_company_default_inventory_account
+from erpnext.accounts.doctype.account.account import update_account_number
+from erpnext.accounts.doctype.account.account import merge_account
 
+class TestAccount(unittest.TestCase):
+	def test_rename_account(self):
+		if not frappe.db.exists("Account", "1210 - Debtors - _TC"):
+			acc = frappe.new_doc("Account")
+			acc.account_name = "Debtors"
+			acc.parent_account = "Accounts Receivable - _TC"
+			acc.account_number = "1210"
+			acc.company = "_Test Company"
+			acc.insert()
+
+		account_number, account_name = frappe.db.get_value("Account", "1210 - Debtors - _TC",
+			["account_number", "account_name"])
+		self.assertEqual(account_number, "1210")
+		self.assertEqual(account_name, "Debtors")
+
+		new_account_number = "1211-11-4 - 6 - "
+		new_account_name = "Debtors 1 - Test - "
+
+		update_account_number("1210 - Debtors - _TC", new_account_name, new_account_number)
+
+		new_acc = frappe.db.get_value("Account", "1211-11-4 - 6 - - Debtors 1 - Test - - _TC",
+			["account_name", "account_number"], as_dict=1)
+
+		self.assertEqual(new_acc.account_name, "Debtors 1 - Test -")
+		self.assertEqual(new_acc.account_number, "1211-11-4 - 6 -")
+
+		frappe.delete_doc("Account", "1211-11-4 - 6 - Debtors 1 - Test - - _TC")
+
+	def test_merge_account(self):
+		if not frappe.db.exists("Account", "Current Assets - _TC"):
+			acc = frappe.new_doc("Account")
+			acc.account_name = "Current Assets"
+			acc.is_group = 1
+			acc.parent_account = "Application of Funds (Assets) - _TC"
+			acc.company = "_Test Company"
+			acc.insert()
+		if not frappe.db.exists("Account", "Securities and Deposits - _TC"):
+			acc = frappe.new_doc("Account")
+			acc.account_name = "Securities and Deposits"
+			acc.parent_account = "Current Assets - _TC"
+			acc.is_group = 1
+			acc.company = "_Test Company"
+			acc.insert()
+		if not frappe.db.exists("Account", "Earnest Money - _TC"):
+			acc = frappe.new_doc("Account")
+			acc.account_name = "Earnest Money"
+			acc.parent_account = "Securities and Deposits - _TC"
+			acc.company = "_Test Company"
+			acc.insert()
+		if not frappe.db.exists("Account", "Cash In Hand - _TC"):
+			acc = frappe.new_doc("Account")
+			acc.account_name = "Cash In Hand"
+			acc.is_group = 1
+			acc.parent_account = "Current Assets - _TC"
+			acc.company = "_Test Company"
+			acc.insert()
+		if not frappe.db.exists("Account", "Accumulated Depreciation - _TC"):
+			acc = frappe.new_doc("Account")
+			acc.account_name = "Accumulated Depreciation"
+			acc.parent_account = "Fixed Assets - _TC"
+			acc.company = "_Test Company"
+			acc.insert()
+
+		doc = frappe.get_doc("Account", "Securities and Deposits - _TC")
+		parent = frappe.db.get_value("Account", "Earnest Money - _TC", "parent_account")
+
+		self.assertEqual(parent, "Securities and Deposits - _TC")
+
+		merge_account("Securities and Deposits - _TC", "Cash In Hand - _TC", doc.is_group, doc.root_type, doc.company)
+		parent = frappe.db.get_value("Account", "Earnest Money - _TC", "parent_account")
+
+		# Parent account of the child account changes after merging
+		self.assertEqual(parent, "Cash In Hand - _TC")
+
+		# Old account doesn't exist after merging
+		self.assertFalse(frappe.db.exists("Account", "Securities and Deposits - _TC"))
+
+		doc = frappe.get_doc("Account", "Current Assets - _TC")
+
+		# Raise error as is_group property doesn't match
+		self.assertRaises(frappe.ValidationError, merge_account, "Current Assets - _TC",\
+			"Accumulated Depreciation - _TC", doc.is_group, doc.root_type, doc.company)
+
+		doc = frappe.get_doc("Account", "Capital Stock - _TC")
+
+		# Raise error as root_type property doesn't match
+		self.assertRaises(frappe.ValidationError, merge_account, "Capital Stock - _TC",\
+			"Softwares - _TC", doc.is_group, doc.root_type, doc.company)
+
+	def test_account_sync(self):
+		del frappe.local.flags["ignore_root_company_validation"]
+		acc = frappe.new_doc("Account")
+		acc.account_name = "Test Sync Account"
+		acc.parent_account = "Temporary Accounts - _TC3"
+		acc.company = "_Test Company 3"
+		acc.insert()
+
+		acc_tc_4 = frappe.db.get_value('Account', {'account_name': "Test Sync Account", "company": "_Test Company 4"})
+		acc_tc_5 = frappe.db.get_value('Account', {'account_name': "Test Sync Account", "company": "_Test Company 5"})
+		self.assertEqual(acc_tc_4, "Test Sync Account - _TC4")
+		self.assertEqual(acc_tc_5, "Test Sync Account - _TC5")
 
 def _make_test_records(verbose):
 	from frappe.test_runner import make_test_objects
@@ -21,6 +125,7 @@ def _make_test_records(verbose):
 		["_Test Account Customs Duty", "_Test Account Stock Expenses", 0, "Tax", None],
 		["_Test Account Insurance Charges", "_Test Account Stock Expenses", 0, "Chargeable", None],
 		["_Test Account Stock Adjustment", "_Test Account Stock Expenses", 0, "Stock Adjustment", None],
+		["_Test Employee Advance", "Current Liabilities", 0, None, None],
 
 		["_Test Account Tax Assets", "Current Assets", 1, None, None],
 		["_Test Account VAT", "_Test Account Tax Assets", 0, "Tax", None],
@@ -39,7 +144,7 @@ def _make_test_records(verbose):
 
 		# 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, None, None],
@@ -69,20 +174,24 @@ def _make_test_records(verbose):
 def get_inventory_account(company, warehouse=None):
 	account = None
 	if warehouse:
-		account = get_warehouse_account(warehouse, company)
+		account = get_warehouse_account(frappe.get_doc("Warehouse", warehouse))
 	else:
 		account = get_company_default_inventory_account(company)
 
 	return account
 
 def create_account(**kwargs):
-	account = frappe.get_doc(dict(
-		doctype = "Account",
-		account_name = kwargs.get('account_name'),
-		account_type = kwargs.get('account_type'),
-		parent_account = kwargs.get('parent_account'),
-		company = kwargs.get('company')
-	))
-	
-	account.save()
-	return account.name
+	account = frappe.db.get_value("Account", filters={"account_name": kwargs.get("account_name"), "company": kwargs.get("company")})
+	if account:
+		return account
+	else:
+		account = frappe.get_doc(dict(
+			doctype = "Account",
+			account_name = kwargs.get('account_name'),
+			account_type = kwargs.get('account_type'),
+			parent_account = kwargs.get('parent_account'),
+			company = kwargs.get('company')
+		))
+
+		account.save()
+		return account.name

erpnext/accounts/doctype/account/tests/test_account_with_number.js

@@ -0,0 +1,69 @@
+QUnit.module('accounts');
+
+QUnit.test("test account with number", function(assert) {
+	assert.expect(7);
+	let done = assert.async();
+	frappe.run_serially([
+		() => frappe.set_route('Tree', 'Account'),
+		() => frappe.click_link('Income'),
+		() => frappe.click_button('Add Child'),
+		() => frappe.timeout(.5),
+		() => {
+			cur_dialog.fields_dict.account_name.$input.val("Test Income");
+			cur_dialog.fields_dict.account_number.$input.val("4010");
+		},
+		() => frappe.click_button('Create New'),
+		() => frappe.timeout(1),
+		() => {
+			assert.ok($('a:contains("4010 - Test Income"):visible').length!=0, "Account created with number");
+		},
+		() => frappe.click_link('4010 - Test Income'),
+		() => frappe.click_button('Edit'),
+		() => frappe.timeout(.5),
+		() => frappe.click_button('Update Account Number'),
+		() => frappe.timeout(.5),
+		() => {
+			cur_dialog.fields_dict.account_number.$input.val("4020");
+		},
+		() => frappe.timeout(1),
+		() => cur_dialog.primary_action(),
+		() => frappe.timeout(1),
+		() => cur_frm.refresh_fields(),
+		() => frappe.timeout(.5),
+		() => {
+			var abbr = frappe.get_abbr(frappe.defaults.get_default("Company"));
+			var new_account = "4020 - Test Income - " + abbr;
+			assert.ok(cur_frm.doc.name==new_account, "Account renamed");
+			assert.ok(cur_frm.doc.account_name=="Test Income", "account name remained same");
+			assert.ok(cur_frm.doc.account_number=="4020", "Account number updated to 4020");
+		},
+		() => frappe.timeout(1),
+		() => frappe.click_button('Menu'),
+		() => frappe.click_link('Rename'),
+		() => frappe.timeout(.5),
+		() => {
+			cur_dialog.fields_dict.new_name.$input.val("4030 - Test Income");
+		},
+		() => frappe.timeout(.5),
+		() => frappe.click_button("Rename"),
+		() => frappe.timeout(2),
+		() => {
+			assert.ok(cur_frm.doc.account_name=="Test Income", "account name remained same");
+			assert.ok(cur_frm.doc.account_number=="4030", "Account number updated to 4030");
+		},
+		() => frappe.timeout(.5),
+		() => frappe.click_button('Chart of Accounts'),
+		() => frappe.timeout(.5),
+		() => frappe.click_button('Menu'),
+		() => frappe.click_link('Refresh'),
+		() => frappe.click_button('Expand All'),
+		() => frappe.click_link('4030 - Test Income'),
+		() => frappe.click_button('Delete'),
+		() => frappe.click_button('Yes'),
+		() => frappe.timeout(.5),
+		() => {
+			assert.ok($('a:contains("4030 - Test Account"):visible').length==0, "Account deleted");
+		},
+		() => done()
+	]);
+});

erpnext/accounts/doctype/account_subtype/account_subtype.js

@@ -0,0 +1,8 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Account Subtype', {
+	refresh: function() {
+
+	}
+});

erpnext/accounts/doctype/account_subtype/account_subtype.json

@@ -0,0 +1,134 @@
+{
+ "allow_copy": 0, 
+ "allow_events_in_timeline": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:account_subtype", 
+ "beta": 0, 
+ "creation": "2018-10-25 15:46:08.054586", 
+ "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, 
+   "fieldname": "account_subtype", 
+   "fieldtype": "Data", 
+   "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": "Account Subtype", 
+   "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": 1
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-10-25 15:47:03.841390", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Account Subtype", 
+ "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": 0, 
+   "write": 1
+  }, 
+  {
+   "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": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "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": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0, 
+ "track_views": 0
+}

erpnext/accounts/doctype/account_subtype/account_subtype.py

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

erpnext/accounts/doctype/account_subtype/test_account_subtype.js

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

erpnext/accounts/doctype/account_subtype/test_account_subtype.py

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

erpnext/accounts/doctype/account_type/account_type.js

@@ -0,0 +1,8 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Account Type', {
+	refresh: function() {
+
+	}
+});

erpnext/accounts/doctype/account_type/account_type.json

@@ -0,0 +1,134 @@
+{
+ "allow_copy": 0, 
+ "allow_events_in_timeline": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:account_type", 
+ "beta": 0, 
+ "creation": "2018-10-25 15:45:45.789963", 
+ "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, 
+   "fieldname": "account_type", 
+   "fieldtype": "Data", 
+   "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": "Account Type", 
+   "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": 1
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-10-25 15:46:51.042604", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Account Type", 
+ "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": 0, 
+   "write": 1
+  }, 
+  {
+   "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": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "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": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0, 
+ "track_views": 0
+}

erpnext/accounts/doctype/account_type/account_type.py

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

erpnext/accounts/doctype/account_type/test_account_type.js

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

erpnext/accounts/doctype/account_type/test_account_type.py

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

erpnext/accounts/doctype/accounting_period/accounting_period.js

@@ -0,0 +1,24 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Accounting Period', {
+	onload: function(frm) {
+		if(frm.doc.closed_documents.length === 0 || (frm.doc.closed_documents.length === 1 && frm.doc.closed_documents[0].document_type == undefined)) {
+			frappe.call({
+				method: "get_doctypes_for_closing",
+				doc:frm.doc,
+				callback: function(r) {
+					if(r.message) {
+						cur_frm.clear_table("closed_documents");
+						r.message.forEach(function(element) {
+							var c = frm.add_child("closed_documents");
+							c.document_type = element.document_type;
+							c.closed = element.closed;
+						});
+						refresh_field("closed_documents");
+					}
+				}
+			});
+		}
+	}
+});

erpnext/accounts/doctype/accounting_period/accounting_period.json

@@ -0,0 +1,349 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:period_name", 
+ "beta": 0, 
+ "creation": "2018-04-13 18:50:14.672323", 
+ "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, 
+   "fieldname": "period_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": "Period Name", 
+   "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_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "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": "Start Date", 
+   "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_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "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": "End Date", 
+   "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_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_4", 
+   "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_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": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "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": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "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": "Status", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Open\nClosed", 
+   "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_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_7", 
+   "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": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "closed_documents", 
+   "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": "Closed Documents", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Closed Document", 
+   "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
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-04-13 19:14:47.593753", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Accounting Period", 
+ "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": 0, 
+   "write": 1
+  }, 
+  {
+   "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": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "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": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "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/accounting_period/accounting_period.py

@@ -0,0 +1,55 @@
+# -*- 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
+
+class AccountingPeriod(Document):
+	def validate(self):
+		self.validate_overlap()
+
+	def before_insert(self):
+		self.bootstrap_doctypes_for_closing()
+
+	def autoname(self):
+		company_abbr = frappe.get_cached_value('Company',  self.company,  "abbr")
+		self.name = " - ".join([self.period_name, company_abbr])
+
+	def validate_overlap(self):
+		existing_accounting_period = frappe.db.sql("""select name from `tabAccounting Period`
+			where (
+				(%(start_date)s between start_date and end_date)
+				or (%(end_date)s between start_date and end_date)
+				or (start_date between %(start_date)s and %(end_date)s)
+				or (end_date between %(start_date)s and %(end_date)s)
+			) and name!=%(name)s and company=%(company)s""",
+			{
+				"start_date": self.start_date,
+				"end_date": self.end_date,
+				"name": self.name,
+				"company": self.company
+			}, as_dict=True)
+
+		if len(existing_accounting_period) > 0:
+			frappe.throw(_("Accounting Period overlaps with {0}".format(existing_accounting_period[0].get("name"))))
+
+	def get_doctypes_for_closing(self):
+		docs_for_closing = []
+		#if not self.closed_documents or len(self.closed_documents) == 0:
+		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)
+
+		return docs_for_closing
+
+	def bootstrap_doctypes_for_closing(self):
+		if len(self.closed_documents) == 0:
+			for doctype_for_closing in self.get_doctypes_for_closing():
+				self.append('closed_documents', {
+					"document_type": doctype_for_closing.document_type,
+					"closed": doctype_for_closing.closed
+				})

erpnext/accounts/doctype/accounting_period/test_accounting_period.js

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

erpnext/accounts/doctype/accounting_period/test_accounting_period.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# class TestAccountingPeriod(unittest.TestCase):
+# 	def test_overlap(self):
+# 		ap1 = create_accounting_period({"start_date":"2018-04-01", "end_date":"2018-06-30", "company":"Wind Power LLC"})
+# 		ap1.save()
+# 		ap2 = create_accounting_period({"start_date":"2018-06-30", "end_date":"2018-07-10", "company":"Wind Power LLC"})
+# 		self.assertRaises(frappe.OverlapError, accounting_period_2.save())
+#
+# 	def tearDown(self):
+# 		pass
+#
+#
+# def create_accounting_period(**args):
+# 	accounting_period = frappe.new_doc("Accounting Period")
+# 	accounting_period.start_date = args.start_date or frappe.utils.datetime.date(2018, 4, 1)
+# 	accounting_period.end_date = args.end_date or frappe.utils.datetime.date(2018, 6, 30)
+# 	accounting_period.company = args.company
+# 	accounting_period.period_name = "_Test_Period_Name_1"
+#
+# 	return accounting_period

erpnext/accounts/doctype/accounts_settings/accounts_settings.py

@@ -7,14 +7,17 @@ from __future__ import unicode_literals
 import frappe
 from frappe.utils import cint
 from frappe.model.document import Document
+from frappe.custom.doctype.property_setter.property_setter import make_property_setter
 
 
 class AccountsSettings(Document):
 	def on_update(self):
-		pass
+		frappe.clear_cache()
 
 	def validate(self):
 		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:
@@ -22,3 +25,13 @@ class AccountsSettings(Document):
 				"Stale Days should start from 1.", title='Error', indicator='red',
 				raise_exception=1)
 
+	def enable_payment_schedule_in_print(self):
+		show_in_print = cint(self.show_payment_schedule_in_print)
+		for doctype in ("Sales Order", "Sales Invoice", "Purchase Order", "Purchase Invoice"):
+			make_property_setter(doctype, "due_date", "print_hide", show_in_print, "Check")
+			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/test_accounts_settings.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import unittest
 
 import frappe

erpnext/accounts/doctype/allowed_to_transact_with/allowed_to_transact_with.json

@@ -0,0 +1,74 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-04-16 21:50:05.860195", 
+ "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": "", 
+   "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": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "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": 1, 
+   "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": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-04-20 14:00:46.014502", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Allowed To Transact With", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "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/allowed_to_transact_with/allowed_to_transact_with.py

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

erpnext/accounts/doctype/asset/asset.js

@@ -1,299 +0,0 @@
-// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.provide("erpnext.asset");
-
-frappe.ui.form.on('Asset', {
-	onload: function(frm) {
-		frm.set_query("item_code", function() {
-			return {
-				"filters": {
-					"disabled": 0,
-					"is_fixed_asset": 1,
-					"is_stock_item": 0
-				}
-			};
-		});
-
-		frm.set_query("warehouse", function() {
-			return {
-				"filters": {
-					"company": frm.doc.company,
-					"is_group": 0
-				}
-			};
-		});
-	},
-
-	refresh: function(frm) {
-		frappe.ui.form.trigger("Asset", "is_existing_asset");
-		frm.toggle_display("next_depreciation_date", frm.doc.docstatus < 1);
-		frm.events.make_schedules_editable(frm);
-
-		if (frm.doc.docstatus==1) {
-			if (frm.doc.status=='Submitted' && !frm.doc.is_existing_asset && !frm.doc.purchase_invoice) {
-				frm.add_custom_button("Make Purchase Invoice", function() {
-					erpnext.asset.make_purchase_invoice(frm);
-				});
-			}
-			if (in_list(["Submitted", "Partially Depreciated", "Fully Depreciated"], frm.doc.status)) {
-				frm.add_custom_button("Transfer Asset", function() {
-					erpnext.asset.transfer_asset(frm);
-				});
-
-				frm.add_custom_button("Scrap Asset", function() {
-					erpnext.asset.scrap_asset(frm);
-				});
-
-				frm.add_custom_button("Sell Asset", function() {
-					erpnext.asset.make_sales_invoice(frm);
-				});
-
-			} else if (frm.doc.status=='Scrapped') {
-				frm.add_custom_button("Restore Asset", function() {
-					erpnext.asset.restore_asset(frm);
-				});
-			}
-
-			frm.trigger("setup_chart");
-		}
-	},
-
-	setup_chart: function(frm) {
-		var x_intervals = [frm.doc.purchase_date];
-		var asset_values = [frm.doc.gross_purchase_amount];
-		var last_depreciation_date = frm.doc.purchase_date;
-
-		if(frm.doc.opening_accumulated_depreciation) {
-			last_depreciation_date = frappe.datetime.add_months(frm.doc.next_depreciation_date,
-				-1*frm.doc.frequency_of_depreciation);
-
-			x_intervals.push(last_depreciation_date);
-			asset_values.push(flt(frm.doc.gross_purchase_amount) -
-				flt(frm.doc.opening_accumulated_depreciation));
-		}
-
-		$.each(frm.doc.schedules || [], function(i, v) {
-			x_intervals.push(v.schedule_date);
-			var asset_value = flt(frm.doc.gross_purchase_amount) - flt(v.accumulated_depreciation_amount);
-			if(v.journal_entry) {
-				last_depreciation_date = v.schedule_date;
-				asset_values.push(asset_value)
-			} else {
-				if (in_list(["Scrapped", "Sold"], frm.doc.status)) {
-					asset_values.push(null)
-				} else {
-					asset_values.push(asset_value)
-				}
-			}
-		})
-
-		if(in_list(["Scrapped", "Sold"], frm.doc.status)) {
-			x_intervals.push(frm.doc.disposal_date);
-			asset_values.push(0);
-			last_depreciation_date = frm.doc.disposal_date;
-		}
-
-		frm.dashboard.render_graph({
-			title: "Asset Value",
-			data: {
-				labels: x_intervals,
-				datasets: [{
-					color: 'green',
-					values: asset_values,
-					formatted: asset_values.map(d => d.toFixed(2))
-				}]
-			},
-			type: 'line'
-		});
-	},
-
-
-	item_code: function(frm) {
-		if(frm.doc.item_code) {
-			frappe.call({
-				method: "erpnext.accounts.doctype.asset.asset.get_item_details",
-				args: {
-					item_code: frm.doc.item_code
-				},
-				callback: function(r, rt) {
-					if(r.message) {
-						$.each(r.message, function(field, value) {
-							frm.set_value(field, value);
-						})
-					}
-				}
-			})
-		}
-	},
-
-	is_existing_asset: function(frm) {
-		frm.toggle_enable("supplier", frm.doc.is_existing_asset);
-		frm.toggle_reqd("next_depreciation_date", !frm.doc.is_existing_asset);
-	},
-
-	opening_accumulated_depreciation: function(frm) {
-		erpnext.asset.set_accululated_depreciation(frm);
-	},
-
-	depreciation_method: function(frm) {
-		frm.events.make_schedules_editable(frm);
-	},
-
-	make_schedules_editable: function(frm) {
-		var is_editable = frm.doc.depreciation_method==="Manual" ? true : false;
-		frm.toggle_enable("schedules", is_editable);
-		frm.fields_dict["schedules"].grid.toggle_enable("schedule_date", is_editable);
-		frm.fields_dict["schedules"].grid.toggle_enable("depreciation_amount", is_editable);
-	}
-
-});
-
-frappe.ui.form.on('Depreciation Schedule', {
-	make_depreciation_entry: function(frm, cdt, cdn) {
-		var row = locals[cdt][cdn];
-		if (!row.journal_entry) {
-			frappe.call({
-				method: "erpnext.accounts.doctype.asset.depreciation.make_depreciation_entry",
-				args: {
-					"asset_name": frm.doc.name,
-					"date": row.schedule_date
-				},
-				callback: function(r) {
-					frappe.model.sync(r.message);
-					frm.refresh();
-				}
-			})
-		}
-	},
-
-	depreciation_amount: function(frm, cdt, cdn) {
-		erpnext.asset.set_accululated_depreciation(frm);
-	}
-
-})
-
-erpnext.asset.set_accululated_depreciation = function(frm) {
-	if(frm.doc.depreciation_method != "Manual") return;
-
-	var accumulated_depreciation = flt(frm.doc.opening_accumulated_depreciation);
-	$.each(frm.doc.schedules || [], function(i, row) {
-		accumulated_depreciation  += flt(row.depreciation_amount);
-		frappe.model.set_value(row.doctype, row.name,
-			"accumulated_depreciation_amount", accumulated_depreciation);
-	})
-}
-
-erpnext.asset.make_purchase_invoice = function(frm) {
-	frappe.call({
-		args: {
-			"asset": frm.doc.name,
-			"item_code": frm.doc.item_code,
-			"gross_purchase_amount": frm.doc.gross_purchase_amount,
-			"company": frm.doc.company,
-			"posting_date": frm.doc.purchase_date
-		},
-		method: "erpnext.accounts.doctype.asset.asset.make_purchase_invoice",
-		callback: function(r) {
-			var doclist = frappe.model.sync(r.message);
-			frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
-		}
-	})
-}
-
-erpnext.asset.make_sales_invoice = function(frm) {
-	frappe.call({
-		args: {
-			"asset": frm.doc.name,
-			"item_code": frm.doc.item_code,
-			"company": frm.doc.company
-		},
-		method: "erpnext.accounts.doctype.asset.asset.make_sales_invoice",
-		callback: function(r) {
-			var doclist = frappe.model.sync(r.message);
-			frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
-		}
-	})
-}
-
-erpnext.asset.scrap_asset = function(frm) {
-	frappe.confirm(__("Do you really want to scrap this asset?"), function () {
-		frappe.call({
-			args: {
-				"asset_name": frm.doc.name
-			},
-			method: "erpnext.accounts.doctype.asset.depreciation.scrap_asset",
-			callback: function(r) {
-				cur_frm.reload_doc();
-			}
-		})
-	})
-}
-
-erpnext.asset.restore_asset = function(frm) {
-	frappe.confirm(__("Do you really want to restore this scrapped asset?"), function () {
-		frappe.call({
-			args: {
-				"asset_name": frm.doc.name
-			},
-			method: "erpnext.accounts.doctype.asset.depreciation.restore_asset",
-			callback: function(r) {
-				cur_frm.reload_doc();
-			}
-		})
-	})
-}
-
-erpnext.asset.transfer_asset = function(frm) {
-	var dialog = new frappe.ui.Dialog({
-		title: __("Transfer Asset"),
-		fields: [
-			{
-				"label": __("Target Warehouse"),
-				"fieldname": "target_warehouse",
-				"fieldtype": "Link",
-				"options": "Warehouse",
-				"get_query": function () {
-					return {
-						filters: [
-							["Warehouse", "company", "in", ["", cstr(frm.doc.company)]],
-							["Warehouse", "is_group", "=", 0]
-						]
-					}
-				},
-				"reqd": 1
-			},
-			{
-				"label": __("Date"),
-				"fieldname": "transfer_date",
-				"fieldtype": "Datetime",
-				"reqd": 1,
-				"default": frappe.datetime.now_datetime()
-			}
-		]
-	});
-
-	dialog.set_primary_action(__("Transfer"), function() {
-		var args = dialog.get_values();
-		if(!args) return;
-		dialog.hide();
-		return frappe.call({
-			type: "GET",
-			method: "erpnext.accounts.doctype.asset.asset.transfer_asset",
-			args: {
-				args: {
-					"asset": frm.doc.name,
-					"transaction_date": args.transfer_date,
-					"source_warehouse": frm.doc.warehouse,
-					"target_warehouse": args.target_warehouse,
-					"company": frm.doc.company
-				}
-			},
-			freeze: true,
-			callback: function(r) {
-				cur_frm.reload_doc();
-			}
-		})
-	});
-	dialog.show();
-}

erpnext/accounts/doctype/asset/asset.json

@@ -1,922 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "field:asset_name", 
- "beta": 0, 
- "creation": "2016-03-01 17:01:27.920130", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 0, 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "asset_name", 
-   "fieldtype": "Data", 
-   "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": "Asset Name", 
-   "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_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "item_code", 
-   "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": 1, 
-   "label": "Item Code", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Item", 
-   "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_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "item_name", 
-   "fieldtype": "Read Only", 
-   "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": "Item Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "item_code.item_name", 
-   "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_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "asset_category", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Asset Category", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Asset Category", 
-   "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_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Draft", 
-   "fieldname": "status", 
-   "fieldtype": "Select", 
-   "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": "Status", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Draft\nSubmitted\nPartially Depreciated\nFully Depreciated\nSold\nScrapped", 
-   "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_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "image", 
-   "fieldtype": "Attach Image", 
-   "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": "Image", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "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_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_3", 
-   "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, 
-   "unique": 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": 0, 
-   "in_standard_filter": 0, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company", 
-   "permlevel": 0, 
-   "precision": "", 
-   "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, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "warehouse", 
-   "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": 1, 
-   "label": "Warehouse", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Warehouse", 
-   "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_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "is_existing_asset", 
-   "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 Existing Asset", 
-   "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, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "purchase_date", 
-   "fieldtype": "Date", 
-   "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": "Purchase Date", 
-   "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_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "supplier", 
-   "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": "Supplier", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Supplier", 
-   "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_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "purchase_invoice", 
-   "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": "Purchase Invoice", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Purchase Invoice", 
-   "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_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "disposal_date", 
-   "fieldtype": "Date", 
-   "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": "Disposal 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_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "journal_entry_for_scrap", 
-   "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": "Journal Entry for Scrap", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Journal Entry", 
-   "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, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_5", 
-   "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, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "gross_purchase_amount", 
-   "fieldtype": "Currency", 
-   "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": "Gross Purchase Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "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_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "", 
-   "fieldname": "expected_value_after_useful_life", 
-   "fieldtype": "Currency", 
-   "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": "Expected Value After Useful Life", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "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_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "is_existing_asset", 
-   "fieldname": "opening_accumulated_depreciation", 
-   "fieldtype": "Currency", 
-   "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": "Opening Accumulated Depreciation", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Company:company:default_currency", 
-   "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_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "value_after_depreciation", 
-   "fieldtype": "Currency", 
-   "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": "Value After Depreciation", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "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_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_11", 
-   "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, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "depends_on": "", 
-   "fieldname": "depreciation_method", 
-   "fieldtype": "Select", 
-   "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": "Depreciation Method", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nStraight Line\nDouble Declining Balance\nManual", 
-   "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_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "total_number_of_depreciations", 
-   "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": "Total Number of Depreciations", 
-   "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, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:(doc.is_existing_asset && doc.opening_accumulated_depreciation)", 
-   "fieldname": "number_of_depreciations_booked", 
-   "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": "Number of Depreciations Booked", 
-   "length": 0, 
-   "no_copy": 1, 
-   "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_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "frequency_of_depreciation", 
-   "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": "Frequency of Depreciation (Months)", 
-   "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, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "next_depreciation_date", 
-   "fieldtype": "Date", 
-   "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": "Next Depreciation Date", 
-   "length": 0, 
-   "no_copy": 1, 
-   "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_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_14", 
-   "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": "Depreciation Schedule", 
-   "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, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "schedules", 
-   "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": "Depreciation Schedules", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Depreciation Schedule", 
-   "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_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": "Asset", 
-   "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
-  }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 72, 
- "image_field": "image", 
- "image_view": 0, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-02-17 16:26:19.111939", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Asset", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 1, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
-   "write": 1
-  }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 1, 
- "show_name_in_global_search": 1, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}

erpnext/accounts/doctype/asset/asset.py

@@ -1,260 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2016, 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.utils import flt, add_months, cint, nowdate, getdate
-from frappe.model.document import Document
-from erpnext.accounts.doctype.purchase_invoice.purchase_invoice import get_fixed_asset_account
-from erpnext.accounts.doctype.asset.depreciation \
-	import get_disposal_account_and_cost_center, get_depreciation_accounts
-
-class Asset(Document):
-	def validate(self):
-		self.status = self.get_status()
-		self.validate_item()
-		self.set_missing_values()
-		self.validate_asset_values()
-		self.make_depreciation_schedule()
-		self.set_accumulated_depreciation()
-		if self.get("schedules"):
-			self.validate_expected_value_after_useful_life()
-		# Validate depreciation related accounts
-		get_depreciation_accounts(self)
-
-	def on_submit(self):
-		self.set_status()
-
-	def on_cancel(self):
-		self.validate_cancellation()
-		self.delete_depreciation_entries()
-		self.set_status()
-
-	def validate_item(self):
-		item = frappe.db.get_value("Item", self.item_code,
-			["is_fixed_asset", "is_stock_item", "disabled"], as_dict=1)
-		if not item:
-			frappe.throw(_("Item {0} does not exist").format(self.item_code))
-		elif item.disabled:
-			frappe.throw(_("Item {0} has been disabled").format(self.item_code))
-		elif not item.is_fixed_asset:
-			frappe.throw(_("Item {0} must be a Fixed Asset Item").format(self.item_code))
-		elif item.is_stock_item:
-			frappe.throw(_("Item {0} must be a non-stock item").format(self.item_code))
-
-	def set_missing_values(self):
-		if self.item_code:
-			item_details = get_item_details(self.item_code)
-			for field, value in item_details.items():
-				if not self.get(field):
-					self.set(field, value)
-
-		self.value_after_depreciation = (flt(self.gross_purchase_amount) -
-			flt(self.opening_accumulated_depreciation))
-
-	def validate_asset_values(self):
-		if flt(self.expected_value_after_useful_life) >= flt(self.gross_purchase_amount):
-			frappe.throw(_("Expected Value After Useful Life must be less than Gross Purchase Amount"))
-
-		if not flt(self.gross_purchase_amount):
-			frappe.throw(_("Gross Purchase Amount is mandatory"), frappe.MandatoryError)
-
-		if not self.is_existing_asset:
-			self.opening_accumulated_depreciation = 0
-			self.number_of_depreciations_booked = 0
-			if not self.next_depreciation_date:
-				frappe.throw(_("Next Depreciation Date is mandatory for new asset"))
-		else:
-			depreciable_amount = flt(self.gross_purchase_amount) - flt(self.expected_value_after_useful_life)
-			if flt(self.opening_accumulated_depreciation) > depreciable_amount:
-					frappe.throw(_("Opening Accumulated Depreciation must be less than equal to {0}")
-						.format(depreciable_amount))
-
-			if self.opening_accumulated_depreciation:
-				if not self.number_of_depreciations_booked:
-					frappe.throw(_("Please set Number of Depreciations Booked"))
-			else:
-				self.number_of_depreciations_booked = 0
-
-			if cint(self.number_of_depreciations_booked) > cint(self.total_number_of_depreciations):
-				frappe.throw(_("Number of Depreciations Booked cannot be greater than Total Number of Depreciations"))
-
-		if self.next_depreciation_date and getdate(self.next_depreciation_date) < getdate(nowdate()):
-			frappe.msgprint(_("Next Depreciation Date is entered as past date"), title=_('Warning'), indicator='red')
-
-		if self.next_depreciation_date and getdate(self.next_depreciation_date) < getdate(self.purchase_date):
-			frappe.throw(_("Next Depreciation Date cannot be before Purchase Date"))
-
-		if (flt(self.value_after_depreciation) > flt(self.expected_value_after_useful_life)
-			and not self.next_depreciation_date):
-				frappe.throw(_("Please set Next Depreciation Date"))
-
-	def make_depreciation_schedule(self):
-		if self.depreciation_method != 'Manual':
-			self.schedules = []
-
-		if not self.get("schedules") and self.next_depreciation_date:
-			value_after_depreciation = flt(self.value_after_depreciation)
-
-			number_of_pending_depreciations = cint(self.total_number_of_depreciations) - \
-				cint(self.number_of_depreciations_booked)
-			if number_of_pending_depreciations:
-				for n in xrange(number_of_pending_depreciations):
-					schedule_date = add_months(self.next_depreciation_date,
-						n * cint(self.frequency_of_depreciation))
-
-					depreciation_amount = self.get_depreciation_amount(value_after_depreciation)
-					value_after_depreciation -= flt(depreciation_amount)
-
-					self.append("schedules", {
-						"schedule_date": schedule_date,
-						"depreciation_amount": depreciation_amount
-					})
-
-	def set_accumulated_depreciation(self):
-		accumulated_depreciation = flt(self.opening_accumulated_depreciation)
-		value_after_depreciation = flt(self.value_after_depreciation)
-		for i, d in enumerate(self.get("schedules")):
-			depreciation_amount = flt(d.depreciation_amount, d.precision("depreciation_amount"))
-			value_after_depreciation -= flt(depreciation_amount)
-
-			if i==len(self.get("schedules"))-1 and self.depreciation_method == "Straight Line":
-				depreciation_amount += flt(value_after_depreciation - flt(self.expected_value_after_useful_life),
-					d.precision("depreciation_amount"))
-
-			d.depreciation_amount = depreciation_amount
-			accumulated_depreciation += d.depreciation_amount
-			d.accumulated_depreciation_amount = flt(accumulated_depreciation, d.precision("accumulated_depreciation_amount"))
-
-	def get_depreciation_amount(self, depreciable_value):
-		if self.depreciation_method in ("Straight Line", "Manual"):
-			depreciation_amount = (flt(self.value_after_depreciation) -
-				flt(self.expected_value_after_useful_life)) / (cint(self.total_number_of_depreciations) -
-				cint(self.number_of_depreciations_booked))
-		else:
-			factor = 200.0 /  self.total_number_of_depreciations
-			depreciation_amount = flt(depreciable_value * factor / 100, 0)
-
-			value_after_depreciation = flt(depreciable_value) - depreciation_amount
-			if value_after_depreciation < flt(self.expected_value_after_useful_life):
-				depreciation_amount = flt(depreciable_value) - flt(self.expected_value_after_useful_life)
-
-		return depreciation_amount
-
-	def validate_expected_value_after_useful_life(self):
-		accumulated_depreciation_after_full_schedule = \
-			max([d.accumulated_depreciation_amount for d in self.get("schedules")])
-
-		asset_value_after_full_schedule = flt(flt(self.gross_purchase_amount) -
-			flt(accumulated_depreciation_after_full_schedule),
-			self.precision('expected_value_after_useful_life'))
-
-		if self.expected_value_after_useful_life < asset_value_after_full_schedule:
-			frappe.throw(_("Expected value after useful life must be greater than or equal to {0}")
-				.format(asset_value_after_full_schedule))
-
-	def validate_cancellation(self):
-		if self.status not in ("Submitted", "Partially Depreciated", "Fully Depreciated"):
-			frappe.throw(_("Asset cannot be cancelled, as it is already {0}").format(self.status))
-
-		if self.purchase_invoice:
-			frappe.throw(_("Please cancel Purchase Invoice {0} first").format(self.purchase_invoice))
-
-	def delete_depreciation_entries(self):
-		for d in self.get("schedules"):
-			if d.journal_entry:
-				frappe.get_doc("Journal Entry", d.journal_entry).cancel()
-				d.db_set("journal_entry", None)
-
-		self.db_set("value_after_depreciation",
-			(flt(self.gross_purchase_amount) - flt(self.opening_accumulated_depreciation)))
-
-	def set_status(self, status=None):
-		'''Get and update status'''
-		if not status:
-			status = self.get_status()
-		self.db_set("status", status)
-
-	def get_status(self):
-		'''Returns status based on whether it is draft, submitted, scrapped or depreciated'''
-		if self.docstatus == 0:
-			status = "Draft"
-		elif self.docstatus == 1:
-			status = "Submitted"
-			if self.journal_entry_for_scrap:
-				status = "Scrapped"
-			elif flt(self.value_after_depreciation) <= flt(self.expected_value_after_useful_life):
-				status = "Fully Depreciated"
-			elif flt(self.value_after_depreciation) < flt(self.gross_purchase_amount):
-				status = 'Partially Depreciated'
-		elif self.docstatus == 2:
-			status = "Cancelled"
-
-		return status
-
-@frappe.whitelist()
-def make_purchase_invoice(asset, item_code, gross_purchase_amount, company, posting_date):
-	pi = frappe.new_doc("Purchase Invoice")
-	pi.company = company
-	pi.currency = frappe.db.get_value("Company", company, "default_currency")
-	pi.set_posting_time = 1
-	pi.posting_date = posting_date
-	pi.append("items", {
-		"item_code": item_code,
-		"is_fixed_asset": 1,
-		"asset": asset,
-		"expense_account": get_fixed_asset_account(asset),
-		"qty": 1,
-		"price_list_rate": gross_purchase_amount,
-		"rate": gross_purchase_amount
-	})
-	pi.set_missing_values()
-	return pi
-
-@frappe.whitelist()
-def make_sales_invoice(asset, item_code, company):
-	si = frappe.new_doc("Sales Invoice")
-	si.company = company
-	si.currency = frappe.db.get_value("Company", company, "default_currency")
-	disposal_account, depreciation_cost_center = get_disposal_account_and_cost_center(company)
-	si.append("items", {
-		"item_code": item_code,
-		"is_fixed_asset": 1,
-		"asset": asset,
-		"income_account": disposal_account,
-		"cost_center": depreciation_cost_center,
-		"qty": 1
-	})
-	si.set_missing_values()
-	return si
-
-@frappe.whitelist()
-def transfer_asset(args):
-	import json
-	args = json.loads(args)
-	movement_entry = frappe.new_doc("Asset Movement")
-	movement_entry.update(args)
-	movement_entry.insert()
-	movement_entry.submit()
-
-	frappe.db.commit()
-
-	frappe.msgprint(_("Asset Movement record {0} created").format("<a href='#Form/Asset Movement/{0}'>{0}</a>".format(movement_entry.name)))
-
-@frappe.whitelist()
-def get_item_details(item_code):
-	asset_category = frappe.db.get_value("Item", item_code, "asset_category")
-
-	if not asset_category:
-		frappe.throw(_("Please enter Asset Category in Item {0}").format(item_code))
-
-	ret = frappe.db.get_value("Asset Category", asset_category,
-		["depreciation_method", "total_number_of_depreciations", "frequency_of_depreciation"], as_dict=1)
-
-	ret.update({
-		"asset_category": asset_category
-	})
-
-	return ret

erpnext/accounts/doctype/asset/test_asset.py

@@ -1,343 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-import frappe
-import unittest
-from frappe.utils import cstr, nowdate, getdate, flt
-from erpnext.accounts.doctype.asset.depreciation import post_depreciation_entries, scrap_asset, restore_asset
-from erpnext.accounts.doctype.asset.asset import make_sales_invoice, make_purchase_invoice
-
-class TestAsset(unittest.TestCase):
-	def setUp(self):
-		set_depreciation_settings_in_company()
-		create_asset()
-		frappe.db.sql("delete from `tabTax Rule`")
-		
-	def test_purchase_asset(self):
-		asset = frappe.get_doc("Asset", "Macbook Pro 1")
-		asset.submit()
-		
-		pi = make_purchase_invoice(asset.name, asset.item_code, asset.gross_purchase_amount, 
-			asset.company, asset.purchase_date)
-		pi.supplier = "_Test Supplier"
-		pi.insert()
-		pi.submit()
-		
-		asset.load_from_db()
-		self.assertEqual(asset.supplier, "_Test Supplier")
-		self.assertEqual(asset.purchase_date, getdate("2015-01-01"))
-		self.assertEqual(asset.purchase_invoice, pi.name)
-		
-		expected_gle = (
-			("_Test Fixed Asset - _TC", 100000.0, 0.0),
-			("Creditors - _TC", 0.0, 100000.0)
-		)
-
-		gle = frappe.db.sql("""select account, debit, credit from `tabGL Entry`
-			where voucher_type='Purchase Invoice' and voucher_no = %s
-			order by account""", pi.name)
-
-		self.assertEqual(gle, expected_gle)
-
-		pi.cancel()
-
-		asset.load_from_db()
-		self.assertEqual(asset.supplier, None)
-		self.assertEqual(asset.purchase_invoice, None)
-		
-		self.assertFalse(frappe.db.get_value("GL Entry", 
-			{"voucher_type": "Purchase Invoice", "voucher_no": pi.name}))
-		
-
-	def test_schedule_for_straight_line_method(self):
-		asset = frappe.get_doc("Asset", "Macbook Pro 1")
-
-		self.assertEqual(asset.status, "Draft")
-
-		expected_schedules = [
-			["2020-12-31", 30000, 30000],
-			["2021-03-31", 30000, 60000],
-			["2021-06-30", 30000, 90000]
-		]
-
-		schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
-			for d in asset.get("schedules")]
-
-		self.assertEqual(schedules, expected_schedules)
-		
-	def test_schedule_for_straight_line_method_for_existing_asset(self):
-		asset = frappe.get_doc("Asset", "Macbook Pro 1")
-		asset.is_existing_asset = 1
-		asset.number_of_depreciations_booked = 1
-		asset.opening_accumulated_depreciation = 40000
-		asset.save()
-		
-		self.assertEqual(asset.status, "Draft")
-
-		expected_schedules = [
-			["2020-12-31", 25000, 65000],
-			["2021-03-31", 25000, 90000]
-		]
-
-		schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
-			for d in asset.get("schedules")]
-
-		self.assertEqual(schedules, expected_schedules)
-
-
-	def test_schedule_for_double_declining_method(self):
-		asset = frappe.get_doc("Asset", "Macbook Pro 1")
-		asset.depreciation_method = "Double Declining Balance"
-		asset.save()
-
-		expected_schedules = [
-			["2020-12-31", 66667, 66667],
-			["2021-03-31", 22222, 88889],
-			["2021-06-30", 1111, 90000]
-		]
-
-		schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
-			for d in asset.get("schedules")]
-
-		self.assertEqual(schedules, expected_schedules)
-		
-	def test_schedule_for_double_declining_method_for_existing_asset(self):
-		asset = frappe.get_doc("Asset", "Macbook Pro 1")
-		asset.depreciation_method = "Double Declining Balance"
-		asset.is_existing_asset = 1
-		asset.number_of_depreciations_booked = 1
-		asset.opening_accumulated_depreciation = 50000
-		asset.save()
-
-		expected_schedules = [
-			["2020-12-31", 33333, 83333],
-			["2021-03-31", 6667, 90000]
-		]
-
-		schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
-			for d in asset.get("schedules")]
-
-		self.assertEqual(schedules, expected_schedules)
-		
-	def test_schedule_for_manual_method(self):
-		asset = frappe.get_doc("Asset", "Macbook Pro 1")
-		asset.depreciation_method = "Manual"
-		asset.schedules = []
-		for schedule_date, amount in [["2020-12-31", 40000], ["2021-06-30", 30000], ["2021-10-31", 20000]]:
-			asset.append("schedules", {
-				"schedule_date": schedule_date,
-				"depreciation_amount": amount
-			})
-		asset.save()
-
-		self.assertEqual(asset.status, "Draft")
-
-		expected_schedules = [
-			["2020-12-31", 40000, 40000],
-			["2021-06-30", 30000, 70000],
-			["2021-10-31", 20000, 90000]
-		]
-
-		schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
-			for d in asset.get("schedules")]
-
-		self.assertEqual(schedules, expected_schedules)
-
-	def test_depreciation(self):
-		asset = frappe.get_doc("Asset", "Macbook Pro 1")
-		asset.submit()
-		asset.load_from_db()
-		self.assertEqual(asset.status, "Submitted")
-
-		frappe.db.set_value("Company", "_Test Company", "series_for_depreciation_entry", "DEPR-")
-
-		post_depreciation_entries(date="2021-01-01")
-		asset.load_from_db()
-
-		self.assertEqual(asset.status, "Partially Depreciated")
-
-		# check depreciation entry series
-		self.assertEqual(asset.get("schedules")[0].journal_entry[:4], "DEPR")
-
-		expected_gle = (
-			("_Test Accumulated Depreciations - _TC", 0.0, 30000.0),
-			("_Test Depreciations - _TC", 30000.0, 0.0)
-		)
-
-		gle = frappe.db.sql("""select account, debit, credit from `tabGL Entry`
-			where against_voucher_type='Asset' and against_voucher = %s
-			order by account""", asset.name)
-
-		self.assertEqual(gle, expected_gle)
-		self.assertEqual(asset.get("value_after_depreciation"), 70000)
-		
-	def test_depreciation_entry_cancellation(self):
-		asset = frappe.get_doc("Asset", "Macbook Pro 1")
-		asset.submit()
-		post_depreciation_entries(date="2021-01-01")
-		
-		asset.load_from_db()
-		
-		# cancel depreciation entry
-		depr_entry = asset.get("schedules")[0].journal_entry
-		self.assertTrue(depr_entry)
-		frappe.get_doc("Journal Entry", depr_entry).cancel()
-		
-		asset.load_from_db()
-		depr_entry = asset.get("schedules")[0].journal_entry
-		self.assertFalse(depr_entry)
-		
-
-	def test_scrap_asset(self):
-		asset = frappe.get_doc("Asset", "Macbook Pro 1")
-		asset.submit()
-		post_depreciation_entries(date="2021-01-01")
-
-		scrap_asset("Macbook Pro 1")
-
-		asset.load_from_db()
-		self.assertEqual(asset.status, "Scrapped")
-		self.assertTrue(asset.journal_entry_for_scrap)
-
-		expected_gle = (
-			("_Test Accumulated Depreciations - _TC", 30000.0, 0.0),
-			("_Test Fixed Asset - _TC", 0.0, 100000.0),
-			("_Test Gain/Loss on Asset Disposal - _TC", 70000.0, 0.0)
-		)
-
-		gle = frappe.db.sql("""select account, debit, credit from `tabGL Entry`
-			where voucher_type='Journal Entry' and voucher_no = %s
-			order by account""", asset.journal_entry_for_scrap)
-
-		self.assertEqual(gle, expected_gle)
-
-		restore_asset("Macbook Pro 1")
-
-		asset.load_from_db()
-		self.assertFalse(asset.journal_entry_for_scrap)
-		self.assertEqual(asset.status, "Partially Depreciated")
-
-	def test_asset_sale(self):
-		frappe.get_doc("Asset", "Macbook Pro 1").submit()
-		post_depreciation_entries(date="2021-01-01")
-
-		si = make_sales_invoice(asset="Macbook Pro 1", item_code="Macbook Pro", company="_Test Company")
-		si.customer = "_Test Customer"
-		si.due_date = nowdate()
-		si.get("items")[0].rate = 25000
-		si.insert()
-		si.submit()
-
-		self.assertEqual(frappe.db.get_value("Asset", "Macbook Pro 1", "status"), "Sold")
-
-		expected_gle = (
-			("_Test Accumulated Depreciations - _TC", 30000.0, 0.0),
-			("_Test Fixed Asset - _TC", 0.0, 100000.0),
-			("_Test Gain/Loss on Asset Disposal - _TC", 45000.0, 0.0),
-			("Debtors - _TC", 25000.0, 0.0)
-		)
-
-		gle = frappe.db.sql("""select account, debit, credit from `tabGL Entry`
-			where voucher_type='Sales Invoice' and voucher_no = %s
-			order by account""", si.name)
-
-		self.assertEqual(gle, expected_gle)
-
-		si.cancel()
-
-		self.assertEqual(frappe.db.get_value("Asset", "Macbook Pro 1", "status"), "Partially Depreciated")
-
-	def test_asset_expected_value_after_useful_life(self):
-		asset = frappe.get_doc("Asset", "Macbook Pro 1")
-		asset.depreciation_method = "Straight Line"
-		asset.is_existing_asset = 1
-		asset.total_number_of_depreciations = 400
-		asset.gross_purchase_amount = 16866177.00
-		asset.expected_value_after_useful_life = 500000
-		asset.save()
-
-		accumulated_depreciation_after_full_schedule = \
-			max([d.accumulated_depreciation_amount for d in asset.get("schedules")])
-
-		asset_value_after_full_schedule = (flt(asset.gross_purchase_amount) -
-			flt(accumulated_depreciation_after_full_schedule))
-
-		self.assertTrue(asset.expected_value_after_useful_life >= asset_value_after_full_schedule)
-
-	def tearDown(self):
-		asset = frappe.get_doc("Asset", "Macbook Pro 1")
-
-		if asset.docstatus == 1 and asset.status not in ("Scrapped", "Sold", "Draft", "Cancelled"):
-			asset.cancel()
-
-			self.assertEqual(frappe.db.get_value("Asset", "Macbook Pro 1", "status"), "Cancelled")
-
-		frappe.delete_doc("Asset", "Macbook Pro 1")
-
-def create_asset():
-	if not frappe.db.exists("Asset Category", "Computers"):
-		create_asset_category()
-
-	if not frappe.db.exists("Item", "Macbook Pro"):
-		create_fixed_asset_item()
-	
-	asset = frappe.get_doc({
-		"doctype": "Asset",
-		"asset_name": "Macbook Pro 1",
-		"asset_category": "Computers",
-		"item_code": "Macbook Pro",
-		"company": "_Test Company",
-		"purchase_date": "2015-01-01",
-		"next_depreciation_date": "2020-12-31",
-		"gross_purchase_amount": 100000,
-		"expected_value_after_useful_life": 10000,
-		"warehouse": "_Test Warehouse - _TC"
-	})
-	try:
-		asset.save()
-	except frappe.DuplicateEntryError:
-		pass
-
-	return asset
-
-def create_asset_category():
-	asset_category = frappe.new_doc("Asset Category")
-	asset_category.asset_category_name = "Computers"
-	asset_category.total_number_of_depreciations = 3
-	asset_category.frequency_of_depreciation = 3
-	asset_category.append("accounts", {
-		"company_name": "_Test Company",
-		"fixed_asset_account": "_Test Fixed Asset - _TC",
-		"accumulated_depreciation_account": "_Test Accumulated Depreciations - _TC",
-		"depreciation_expense_account": "_Test Depreciations - _TC"
-	})
-	asset_category.insert()
-
-def create_fixed_asset_item():
-	try:
-		frappe.get_doc({
-			"doctype": "Item",
-			"item_code": "Macbook Pro",
-			"item_name": "Macbook Pro",
-			"description": "Macbook Pro Retina Display",
-			"asset_category": "Computers",
-			"item_group": "All Item Groups",
-			"stock_uom": "Nos",
-			"is_stock_item": 0,
-			"is_fixed_asset": 1
-		}).insert()		
-	except frappe.DuplicateEntryError:
-		pass
-
-def set_depreciation_settings_in_company():
-	company = frappe.get_doc("Company", "_Test Company")
-	company.accumulated_depreciation_account = "_Test Accumulated Depreciations - _TC"
-	company.depreciation_expense_account = "_Test Depreciations - _TC"
-	company.disposal_account = "_Test Gain/Loss on Asset Disposal - _TC"
-	company.depreciation_cost_center = "_Test Cost Center - _TC"
-	company.save()
-	
-	# Enable booking asset depreciation entry automatically
-	frappe.db.set_value("Accounts Settings", None, "book_asset_depreciation_entry_automatically", 1)

erpnext/accounts/doctype/asset_category/asset_category.py

@@ -1,15 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe import _
-from frappe.utils import cint
-from frappe.model.document import Document
-
-class AssetCategory(Document):
-	def validate(self):
-		for field in ("total_number_of_depreciations", "frequency_of_depreciation"):
-			if cint(self.get(field))<1:
-				frappe.throw(_("{0} must be greater than 0").format(self.meta.get_label(field)), frappe.MandatoryError)

erpnext/accounts/doctype/asset_category_account/asset_category_account.json

@@ -1,149 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2016-03-07 15:55:18.806409", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 3, 
-   "fieldname": "company_name", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company", 
-   "permlevel": 0, 
-   "precision": "", 
-   "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, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 3, 
-   "fieldname": "fixed_asset_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Fixed Asset Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "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_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "accumulated_depreciation_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Accumulated Depreciation Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "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_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "depreciation_expense_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Depreciation Expense Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "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
-  }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2016-11-03 15:12:55.775239", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Asset Category Account", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_seen": 0
-}

erpnext/accounts/doctype/asset_movement/asset_movement.js

@@ -1,18 +0,0 @@
-// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Asset Movement', {
-	onload: function(frm) {
-		frm.add_fetch("asset", "warehouse", "source_warehouse");
-
-		frm.set_query("target_warehouse", function() {
-			return {
-				filters: [
-					["Warehouse", "company", "in", ["", cstr(frm.doc.company)]],
-					["Warehouse", "is_group", "=", 0]
-				]
-			}
-		})
-
-	}
-});

erpnext/accounts/doctype/asset_movement/asset_movement.json

@@ -1,307 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "AM-.#####", 
- "beta": 0, 
- "creation": "2016-04-25 18:00:23.559973", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 0, 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "asset", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Asset", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Asset", 
-   "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_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "transaction_date", 
-   "fieldtype": "Datetime", 
-   "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": "Transaction Date", 
-   "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_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": 0, 
-   "in_standard_filter": 1, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company", 
-   "permlevel": 0, 
-   "precision": "", 
-   "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, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_4", 
-   "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, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "source_warehouse", 
-   "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": 1, 
-   "label": "Source Warehouse", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Warehouse", 
-   "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_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "target_warehouse", 
-   "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": 1, 
-   "label": "Target Warehouse", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Warehouse", 
-   "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_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": "Asset Movement", 
-   "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
-  }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-02-17 16:09:32.069344", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Asset Movement", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 1, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "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
-  }, 
-  {
-   "amend": 1, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
-   "write": 1
-  }, 
-  {
-   "amend": 1, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Stock Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
-   "write": 1
-  }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}

erpnext/accounts/doctype/asset_movement/asset_movement.py

@@ -1,48 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe import _
-from frappe.model.document import Document
-
-class AssetMovement(Document):
-	def validate(self):
-		self.validate_asset()
-		self.validate_warehouses()
-		
-	def validate_asset(self):
-		status, company = frappe.db.get_value("Asset", self.asset, ["status", "company"])
-		if status in ("Draft", "Scrapped", "Sold"):
-			frappe.throw(_("{0} asset cannot be transferred").format(status))
-			
-		if company != self.company:
-			frappe.throw(_("Asset {0} does not belong to company {1}").format(self.asset, self.company))
-			
-	def validate_warehouses(self):
-		if not self.source_warehouse:
-			self.source_warehouse = frappe.db.get_value("Asset", self.asset, "warehouse")
-		
-		if self.source_warehouse == self.target_warehouse:
-			frappe.throw(_("Source and Target Warehouse cannot be same"))
-
-	def on_submit(self):
-		self.set_latest_warehouse_in_asset()
-		
-	def on_cancel(self):
-		self.set_latest_warehouse_in_asset()
-		
-	def set_latest_warehouse_in_asset(self):
-		latest_movement_entry = frappe.db.sql("""select target_warehouse from `tabAsset Movement`
-			where asset=%s and docstatus=1 and company=%s
-			order by transaction_date desc limit 1""", (self.asset, self.company))
-		
-		if latest_movement_entry:
-			warehouse = latest_movement_entry[0][0]
-		else:
-			warehouse = frappe.db.sql("""select source_warehouse from `tabAsset Movement`
-				where asset=%s and docstatus=2 and company=%s
-				order by transaction_date asc limit 1""", (self.asset, self.company))[0][0]
-		
-		frappe.db.set_value("Asset", self.asset, "warehouse", warehouse)

erpnext/accounts/doctype/asset_movement/test_asset_movement.py

@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-import frappe
-from frappe.utils import now
-import unittest
-from erpnext.accounts.doctype.asset.test_asset import create_asset
-
-
-class TestAssetMovement(unittest.TestCase):
-	def test_movement(self):
-		asset = create_asset()
-		
-		if asset.docstatus == 0:
-			asset.submit()
-		
-		movement1 = create_asset_movement(asset, target_warehouse="_Test Warehouse 1 - _TC")
-		self.assertEqual(frappe.db.get_value("Asset", asset.name, "warehouse"), "_Test Warehouse 1 - _TC")
-		
-		movement2 = create_asset_movement(asset, target_warehouse="_Test Warehouse 2 - _TC")
-		self.assertEqual(frappe.db.get_value("Asset", asset.name, "warehouse"), "_Test Warehouse 2 - _TC")
-		
-		movement1.cancel()
-		self.assertEqual(frappe.db.get_value("Asset", asset.name, "warehouse"), "_Test Warehouse 2 - _TC")
-		
-		movement2.cancel()
-		self.assertEqual(frappe.db.get_value("Asset", asset.name, "warehouse"), "_Test Warehouse - _TC")
-		
-		asset.load_from_db()
-		asset.cancel()
-		frappe.delete_doc("Asset", asset.name)
-		
-		
-def create_asset_movement(asset, target_warehouse, transaction_date=None):
-	if not transaction_date:
-		transaction_date = now()
-		
-	movement = frappe.new_doc("Asset Movement")
-	movement.update({
-		"asset": asset.name,
-		"transaction_date": transaction_date,
-		"target_warehouse": target_warehouse,
-		"company": asset.company
-	})
-	
-	movement.insert()
-	movement.submit()
-	
-	return movement

erpnext/accounts/doctype/bank/bank.js

@@ -0,0 +1,30 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Bank', {
+	onload: function(frm) {
+		add_fields_to_mapping_table(frm);
+	},
+	refresh: function(frm) {
+		add_fields_to_mapping_table(frm);
+	}
+});
+
+
+let add_fields_to_mapping_table = function (frm) {
+	let options = [];
+
+	frappe.model.with_doctype("Bank Transaction", function() {
+		let meta = frappe.get_meta("Bank Transaction");
+		meta.fields.forEach(value => {
+			if (!["Section Break", "Column Break"].includes(value.fieldtype)) {
+				options.push(value.fieldname);
+			}
+		});
+	});
+
+	frappe.meta.get_docfield("Bank Transaction Mapping", "bank_transaction_field",
+		frm.doc.name).options = options;
+
+	frm.fields_dict.bank_transaction_mapping.grid.refresh();
+};

erpnext/accounts/doctype/bank/bank.json

@@ -0,0 +1,224 @@
+{
+ "allow_copy": 0, 
+ "allow_events_in_timeline": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:bank_name", 
+ "beta": 0, 
+ "creation": "2018-04-07 16:59:59.496668", 
+ "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, 
+   "fieldname": "bank_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": "Bank Name", 
+   "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": 1
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "data_import_configuration_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": "Data Import Configuration", 
+   "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, 
+   "fieldname": "bank_transaction_mapping", 
+   "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": "Bank Transaction Mapping", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Bank Transaction Mapping", 
+   "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": "section_break_4", 
+   "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": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "plaid_access_token", 
+   "fieldtype": "Data", 
+   "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": "Plaid Access Token", 
+   "length": 0, 
+   "no_copy": 1, 
+   "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
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-11-27 16:12:13.938776", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Bank", 
+ "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": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "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
+}

erpnext/accounts/doctype/bank/bank.py

@@ -0,0 +1,10 @@
+# -*- 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
+
+class Bank(Document):
+	pass

erpnext/accounts/doctype/bank/test_bank.js

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

erpnext/accounts/doctype/bank/test_bank.py

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

erpnext/accounts/doctype/bank_account/bank_account.js

@@ -0,0 +1,41 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Bank Account', {
+	setup: function(frm) {
+		frm.set_query("account", function() {
+			return {
+				filters: {
+					'account_type': 'Bank',
+					'company': frm.doc.company,
+					'is_group': 0
+				}
+			};
+		});
+		frm.set_query("party_type", function() {
+			return {
+				query: "erpnext.setup.doctype.party_type.party_type.get_party_type",
+			};
+		});
+	},
+	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) {
+			frappe.contacts.clear_address_and_contact(frm);
+		}
+		else {
+			frappe.contacts.render_address_and_contact(frm);
+		}
+
+		if (frm.doc.integration_id) {
+			frm.add_custom_button(__("Unlink external integrations"), function() {
+				frappe.confirm(__("This action will unlink this account from any external service integrating ERPNext with your bank accounts. It cannot be undone. Are you certain ?"), function() {
+					frm.set_value("integration_id", "");
+				});
+			});
+		}
+	}
+});

erpnext/accounts/doctype/bank_account/bank_account.py

@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+from frappe.contacts.address_and_contact import load_address_and_contact, delete_contact_and_address
+
+class BankAccount(Document):
+	def onload(self):
+		"""Load address and contacts in `__onload`"""
+		load_address_and_contact(self)
+
+	def autoname(self):
+		self.name = self.account_name + " - " + self.bank
+
+	def on_trash(self):
+		delete_contact_and_address('BankAccount', self.name)
+
+	def validate(self):
+		self.validate_company()
+		self.validate_iban()
+
+	def validate_company(self):
+		if self.is_company_account and not self.company:
+			frappe.throw(_("Company is manadatory for company account"))
+
+	def validate_iban(self):
+		'''
+		Algorithm: https://en.wikipedia.org/wiki/International_Bank_Account_Number#Validating_the_IBAN
+		'''
+		# IBAN field is optional
+		if not self.iban:
+			return
+
+		def encode_char(c):
+			# Position in the alphabet (A=1, B=2, ...) plus nine
+			return str(9 + ord(c) - 64)
+
+		# remove whitespaces, upper case to get the right number from ord()
+		iban = ''.join(self.iban.split(' ')).upper()
+
+		# Move country code and checksum from the start to the end
+		flipped = iban[4:] + iban[:4]
+
+		# Encode characters as numbers
+		encoded = [encode_char(c) if ord(c) >= 65 and ord(c) <= 90 else c for c in flipped]
+
+		try:
+			to_check = int(''.join(encoded))
+		except ValueError:
+			frappe.throw(_('IBAN is not valid'))
+
+		if to_check % 97 != 1:
+			frappe.throw(_('IBAN is not valid'))
+
+
+@frappe.whitelist()
+def make_bank_account(doctype, docname):
+	doc = frappe.new_doc("Bank Account")
+	doc.party_type = doctype
+	doc.party = docname
+	doc.is_default = 1
+
+	return doc
+
+@frappe.whitelist()
+def get_party_bank_account(party_type, party):
+	return frappe.db.get_value(party_type,
+		party, 'default_bank_account')
+
+@frappe.whitelist()
+def get_bank_account_details(bank_account):
+	return frappe.db.get_value("Bank Account",
+		bank_account, ['account', 'bank', 'bank_account_no'], as_dict=1)

erpnext/accounts/doctype/bank_account/test_bank_account.js

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

erpnext/accounts/doctype/bank_account/test_bank_account.py

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

erpnext/accounts/doctype/bank_guarantee/bank_guarantee.js

@@ -1,24 +1,75 @@
 // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
+cur_frm.add_fetch('bank_account','account','account');
+cur_frm.add_fetch('bank_account','bank_account_no','bank_account_no');
+cur_frm.add_fetch('bank_account','iban','iban');
+cur_frm.add_fetch('bank_account','branch_code','branch_code');
+cur_frm.add_fetch('bank_account','swift_number','swift_number');
+
 frappe.ui.form.on('Bank Guarantee', {
-	refresh: function(frm) {
-		cur_frm.set_query("account", function() {
+	setup: function(frm) {
+		frm.set_query("bank", function() {
 			return {
-				"filters": {
-					"account_type": "Bank",
-					"is_group": 0
+				filters: {
+					company: frm.doc.company
 				}
 			};
 		});
-		cur_frm.set_query("project", function() {
+		frm.set_query("bank_account", function() {
 			return {
-				"filters": {
-					"customer": cur_frm.doc.customer
+				filters: {
+					company: frm.doc.company,
+					bank: frm.doc.bank
+				}
+			}
+		});
+		frm.set_query("project", function() {
+			return {
+				filters: {
+					customer: frm.doc.customer
 				}
 			};
 		});
 	},
+
+	bg_type: function(frm) {
+		if (frm.doc.bg_type == "Receiving") {
+			frm.set_value("reference_doctype", "Sales Order");
+		} else if (frm.doc.bg_type == "Providing") {
+			frm.set_value("reference_doctype", "Purchase Order");
+		}
+	},
+
+	reference_docname: function(frm) {
+		if (frm.doc.reference_docname && frm.doc.reference_doctype) {
+			let fields_to_fetch = ["grand_total"];
+			let party_field = frm.doc.reference_doctype == "Sales Order" ? "customer" : "supplier";
+
+			if (frm.doc.reference_doctype == "Sales Order") {
+				fields_to_fetch.push("project");
+			}
+
+			fields_to_fetch.push(party_field);
+			frappe.call({
+				method: "erpnext.accounts.doctype.bank_guarantee.bank_guarantee.get_vouchar_detials",
+				args: {
+					"column_list": fields_to_fetch,
+					"doctype": frm.doc.reference_doctype,
+					"docname": frm.doc.reference_docname
+				},
+				callback: function(r) {
+					if (r.message) {
+						if (r.message[party_field]) frm.set_value(party_field, r.message[party_field]);
+						if (r.message.project) frm.set_value("project", r.message.project);
+						if (r.message.grand_total) frm.set_value("amount", r.message.grand_total);
+					}
+				}
+			});
+
+		}
+	},
+
 	start_date: function(frm) {
 		var end_date = frappe.datetime.add_days(cur_frm.doc.start_date, cur_frm.doc.validity - 1);
 		cur_frm.set_value("end_date", end_date);
@@ -27,4 +78,4 @@ frappe.ui.form.on('Bank Guarantee', {
 		var end_date = frappe.datetime.add_days(cur_frm.doc.start_date, cur_frm.doc.validity - 1);
 		cur_frm.set_value("end_date", end_date);
 	}
-});
+});

erpnext/accounts/doctype/bank_guarantee/bank_guarantee.json

@@ -3,7 +3,7 @@
  "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
- "autoname": "BG-.#####", 
+ "autoname": "ACC-BG-.YYYY.-.#####", 
  "beta": 0, 
  "creation": "2016-12-17 10:43:35.731631", 
  "custom": 0, 
@@ -15,10 +15,111 @@
  "fields": [
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "bg_type", 
+   "fieldtype": "Select", 
+   "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 Guarantee Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nReceiving\nProviding", 
+   "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, 
+   "fieldname": "reference_doctype", 
+   "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": "Reference Document Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "DocType", 
+   "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": "reference_docname", 
+   "fieldtype": "Dynamic 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": "Reference Document Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "reference_doctype", 
+   "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, 
+   "depends_on": "eval: doc.bg_type == \"Receiving\"", 
    "fieldname": "customer", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -39,13 +140,49 @@
    "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "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, 
+   "depends_on": "eval: doc.bg_type == \"Providing\"", 
+   "fieldname": "supplier", 
+   "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": "Supplier", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Supplier", 
+   "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": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -73,16 +210,18 @@
    "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": "account", 
-   "fieldtype": "Link", 
+   "fieldname": "column_break_6", 
+   "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -90,10 +229,8 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Bank Account", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Account", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -101,13 +238,15 @@
    "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "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, 
@@ -134,39 +273,12 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_6", 
-   "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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -193,10 +305,12 @@
    "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, 
@@ -221,13 +335,15 @@
    "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "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, 
@@ -251,13 +367,401 @@
    "read_only": 1, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "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": "bank_account_info", 
+   "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": "Bank Account Info", 
+   "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, 
+   "fieldname": "bank", 
+   "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", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Bank", 
+   "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": "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, 
+   "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": "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": "Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "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": "bank_account_no", 
+   "fieldtype": "Data", 
+   "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 No", 
+   "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": "column_break_17", 
+   "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, 
+   "fieldname": "iban", 
+   "fieldtype": "Data", 
+   "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": "IBAN", 
+   "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": "branch_code", 
+   "fieldtype": "Data", 
+   "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": "Branch Code", 
+   "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": "swift_number", 
+   "fieldtype": "Data", 
+   "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": "SWIFT 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
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_14", 
+   "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, 
+   "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": "more_information", 
+   "fieldtype": "Text Editor", 
+   "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": "Clauses and Conditions", 
+   "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, 
+   "fieldname": "margin_details", 
+   "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": "Other Details", 
+   "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, 
@@ -281,49 +785,21 @@
    "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 1
   }, 
   {
    "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 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, 
-   "label": "More Information", 
-   "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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "more_information", 
-   "fieldtype": "Text Editor", 
+   "fieldname": "name_of_beneficiary", 
+   "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -331,7 +807,7 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Notes", 
+   "label": "Name of Beneficiary", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -344,10 +820,142 @@
    "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": "column_break_19", 
+   "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, 
+   "fieldname": "margin_money", 
+   "fieldtype": "Currency", 
+   "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": "Margin Money", 
+   "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": "", 
+   "depends_on": "", 
+   "fieldname": "charges", 
+   "fieldtype": "Currency", 
+   "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": "Charges Incurred", 
+   "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, 
+   "depends_on": "", 
+   "fieldname": "fixed_deposit_number", 
+   "fieldtype": "Data", 
+   "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": "Fixed Deposit Number", 
+   "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, 
@@ -374,6 +982,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
  ], 
@@ -387,7 +996,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-04-25 13:31:49.627831", 
+ "modified": "2018-08-21 16:15:54.741746", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Bank Guarantee", 
@@ -396,7 +1005,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 0, 
@@ -416,7 +1024,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -444,5 +1051,6 @@
  "sort_order": "DESC", 
  "title_field": "customer", 
  "track_changes": 0, 
- "track_seen": 0
+ "track_seen": 0, 
+ "track_views": 0
 }

erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py

@@ -3,8 +3,24 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-import frappe
+import frappe, json
 from frappe.model.document import Document
+from frappe import _
 
 class BankGuarantee(Document):
-	pass
+	def validate(self):
+		if not (self.customer or self.supplier):
+			frappe.throw(_("Select the customer or supplier."))
+
+	def on_submit(self):
+		if not self.bank_guarantee_number:
+			frappe.throw(_("Enter the Bank Guarantee Number before submittting."))
+		if not self.name_of_beneficiary:
+			frappe.throw(_("Enter the name of the Beneficiary before submittting."))
+		if not self.bank:
+			frappe.throw(_("Enter the name of the bank or lending institution before submittting."))
+
+@frappe.whitelist()
+def get_vouchar_detials(column_list, doctype, docname):
+	return frappe.db.sql(''' select {columns} from `tab{doctype}` where name=%s'''
+		.format(columns=", ".join(json.loads(column_list)), doctype=doctype), docname, as_dict=1)[0]

erpnext/accounts/doctype/bank_guarantee/test_bank_guarantee.js

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

erpnext/accounts/doctype/bank_guarantee/test_bank_guarantee.py

@@ -1,12 +1,10 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 from __future__ import unicode_literals
 
 import frappe
 import unittest
 
-# test_records = frappe.get_test_records('Bank Guarantee')
-
 class TestBankGuarantee(unittest.TestCase):
 	pass

erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json

@@ -159,6 +159,36 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "include_pos_transactions", 
+   "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": "Include POS Transactions", 
+   "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, 
+   "unique": 0
+  }, 
   {
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
@@ -292,7 +322,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-04-21 16:58:26.902732", 
+ "modified": "2018-03-07 18:58:48.658687", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Bank Reconciliation", 

erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py

@@ -14,7 +14,7 @@ form_grid_templates = {
 class BankReconciliation(Document):
 	def get_payment_entries(self):
 		if not (self.bank_account and self.from_date and self.to_date):
-			msgprint("Bank Account, From Date and To Date are Mandatory")
+			msgprint(_("Bank Account, From Date and To Date are Mandatory"))
 			return
 
 		condition = ""
@@ -23,47 +23,68 @@ class BankReconciliation(Document):
 
 
 		journal_entries = frappe.db.sql("""
-			select 
-				"Journal Entry" as payment_document, t1.name as payment_entry, 
-				t1.cheque_no as cheque_number, t1.cheque_date, 
-				t2.debit_in_account_currency as debit, t2.credit_in_account_currency as credit, 
-				t1.posting_date, t2.against_account, t1.clearance_date, t2.account_currency 
+			select
+				"Journal Entry" as payment_document, t1.name as payment_entry,
+				t1.cheque_no as cheque_number, t1.cheque_date,
+				sum(t2.debit_in_account_currency) as debit, sum(t2.credit_in_account_currency) as credit,
+				t1.posting_date, t2.against_account, t1.clearance_date, t2.account_currency
 			from
 				`tabJournal Entry` t1, `tabJournal Entry Account` t2
 			where
 				t2.parent = t1.name and t2.account = %s and t1.docstatus=1
-				and t1.posting_date >= %s and t1.posting_date <= %s 
+				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), (self.bank_account, self.from_date, self.to_date), as_dict=1)
 
 		payment_entries = frappe.db.sql("""
-			select 
-				"Payment Entry" as payment_document, name as payment_entry, 
-				reference_no as cheque_number, reference_date as cheque_date, 
-				if(paid_from=%(account)s, paid_amount, "") as credit, 
-				if(paid_from=%(account)s, "", received_amount) as debit, 
+			select
+				"Payment Entry" as payment_document, name as payment_entry,
+				reference_no as cheque_number, reference_date as cheque_date,
+				if(paid_from=%(account)s, paid_amount, 0) as credit,
+				if(paid_from=%(account)s, 0, received_amount) as debit,
 				posting_date, ifnull(party,if(paid_from=%(account)s,paid_to,paid_from)) as against_account, clearance_date,
 				if(paid_to=%(account)s, paid_to_account_currency, paid_from_account_currency) as account_currency
 			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 {0}
-			order by 
+			order by
 				posting_date ASC, name DESC
-		""".format(condition), 
+		""".format(condition),
 		        {"account":self.bank_account, "from":self.from_date, "to":self.to_date}, as_dict=1)
-		
-		entries = sorted(list(payment_entries)+list(journal_entries), 
+
+		pos_entries = []
+		if self.include_pos_transactions:
+			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.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 {0}
+				order by
+					si.posting_date ASC, si.name DESC
+			""".format(condition),
+			        {"account":self.bank_account, "from":self.from_date, "to":self.to_date}, as_dict=1)
+
+		entries = sorted(list(payment_entries)+list(journal_entries+list(pos_entries)),
 			key=lambda k: k['posting_date'] or getdate(nowdate()))
-				
+
 		self.set('payment_entries', [])
 		self.total_amount = 0.0
 
 		for d in entries:
 			row = self.append('payment_entries', {})
-			amount = d.debit if d.debit else d.credit
-			d.amount = fmt_money(amount, 2, d.account_currency) + " " + (_("Dr") if d.debit else _("Cr"))
+
+			amount = flt(d.get('debit', 0)) - flt(d.get('credit', 0))
+
+			formatted_amount = fmt_money(abs(amount), 2, d.account_currency)
+			d.amount = formatted_amount + " " + (_("Dr") if amount > 0 else _("Cr"))
+
 			d.pop("credit")
 			d.pop("debit")
 			d.pop("account_currency")
@@ -86,10 +107,10 @@ class BankReconciliation(Document):
 					d.clearance_date = None
 
 				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), 
+				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
 
 		if clearance_date_updated:

erpnext/accounts/doctype/bank_reconciliation/test_bank_reconciliation.py

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

erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json

@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_events_in_timeline": 0, 
  "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
@@ -12,6 +13,7 @@
  "fields": [
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -39,10 +41,12 @@
    "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, 
@@ -71,11 +75,13 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "50"
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -103,11 +109,13 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "15"
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -136,10 +144,12 @@
    "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, 
@@ -165,11 +175,13 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "50%"
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -197,10 +209,12 @@
    "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, 
@@ -228,10 +242,12 @@
    "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, 
@@ -259,10 +275,12 @@
    "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, 
@@ -290,6 +308,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
  ], 
@@ -304,7 +323,7 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-06-23 12:07:50.883515", 
+ "modified": "2019-01-07 16:52:07.174687", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Bank Reconciliation Detail", 
@@ -316,5 +335,6 @@
  "show_name_in_global_search": 0, 
  "sort_order": "ASC", 
  "track_changes": 0, 
- "track_seen": 0
+ "track_seen": 0, 
+ "track_views": 0
 }

erpnext/accounts/doctype/bank_statement_settings/bank_statement_settings.js

@@ -0,0 +1,8 @@
+// Copyright (c) 2017, sathishpy@gmail.com and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Bank Statement Settings', {
+	refresh: function(frm) {
+
+	}
+});

erpnext/accounts/doctype/bank_statement_settings/bank_statement_settings.json

@@ -0,0 +1,272 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 1, 
+ "beta": 0, 
+ "creation": "2017-11-13 13:38:10.863592", 
+ "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, 
+   "fieldname": "bank", 
+   "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": "Bank Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Bank", 
+   "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_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "'%d/%m/%Y'", 
+   "fieldname": "date_format", 
+   "fieldtype": "Data", 
+   "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": "Date 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
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "statement_header_mapping", 
+   "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": "Statement Header Mapping", 
+   "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_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "header_items", 
+   "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": "Statement Headers", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Bank Statement Settings Item", 
+   "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_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "transaction_data_mapping", 
+   "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": "Transaction Data Mapping", 
+   "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_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "mapped_items", 
+   "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": "Mapped Items", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Bank Statement Transaction Settings Item", 
+   "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, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-04-07 18:57:04.048423", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Bank Statement Settings", 
+ "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": 0, 
+   "write": 1
+  }, 
+  {
+   "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": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "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/bank_statement_settings/bank_statement_settings.py

@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, sathishpy@gmail.com and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class BankStatementSettings(Document):
+	def autoname(self):
+		self.name = self.bank + "-Statement-Settings"

erpnext/accounts/doctype/bank_statement_settings/test_bank_statement_settings.js

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

erpnext/accounts/doctype/bank_statement_settings/test_bank_statement_settings.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, sathishpy@gmail.com and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestBankStatementSettings(unittest.TestCase):
+	pass

erpnext/accounts/doctype/bank_statement_settings_item/bank_statement_settings_item.json

@@ -0,0 +1,101 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-01-08 00:16:42.762980", 
+ "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, 
+   "fieldname": "mapped_header", 
+   "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": "Mapped Header", 
+   "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": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "stmt_header", 
+   "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": "Bank Header", 
+   "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
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-01-08 00:19:14.841134", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Bank Statement Settings Item", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "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/bank_statement_settings_item/bank_statement_settings_item.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, sathishpy@gmail.com and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class BankStatementSettingsItem(Document):
+	pass