Merge branch 'hotfix'

[HOTFIX] translate domain

.eslintrc

@@ -0,0 +1,137 @@
+{
+	"env": {
+		"browser": true,
+		"node": true,
+		"es6": true
+	},
+	"extends": "eslint:recommended",
+	"rules": {
+		"indent": [
+			"error",
+			"tab",
+			{ "SwitchCase": 1 }
+		],
+		"linebreak-style": [
+			"error",
+			"unix"
+		],
+		"quotes": [
+			"off"
+		],
+		"semi": [
+			"warn",
+			"always"
+		],
+		"camelcase": [
+			"off"
+		],
+		"no-unused-vars": [
+			"warn"
+		],
+		"no-redeclare": [
+			"warn"
+		],
+		"no-console": [
+			"warn"
+		],
+		"no-extra-boolean-cast": [
+			"off"
+		],
+		"no-control-regex": [
+			"off"
+		],
+		"spaced-comment": [
+			"warn"
+		],
+		"no-trailing-spaces": [
+			"warn"
+		]
+	},
+	"root": true,
+	"globals": {
+		"frappe": true,
+		"erpnext": true,
+		"schools": true,
+
+		"$": true,
+		"jQuery": true,
+		"moment": true,
+		"hljs": true,
+		"Awesomplete": true,
+		"CalHeatMap": true,
+		"Sortable": true,
+		"Showdown": true,
+		"Taggle": true,
+		"Gantt": true,
+		"Slick": true,
+		"PhotoSwipe": true,
+		"PhotoSwipeUI_Default": true,
+		"fluxify": true,
+		"io": true,
+		"c3": true,
+		"__": true,
+		"_p": true,
+		"_f": true,
+		"repl": true,
+		"Class": true,
+		"locals": true,
+		"cint": true,
+		"cstr": true,
+		"cur_frm": true,
+		"cur_dialog": true,
+		"cur_page": true,
+		"cur_list": true,
+		"cur_tree": true,
+		"msg_dialog": true,
+		"is_null": true,
+		"in_list": true,
+		"has_common": true,
+		"has_words": true,
+		"validate_email": true,
+		"get_number_format": true,
+		"format_number": true,
+		"format_currency": true,
+		"round_based_on_smallest_currency_fraction": true,
+		"roundNumber": true,
+		"comment_when": true,
+		"replace_newlines": true,
+		"open_url_post": true,
+		"toTitle": true,
+		"lstrip": true,
+		"strip": true,
+		"strip_html": true,
+		"replace_all": true,
+		"flt": true,
+		"precision": true,
+		"md5": true,
+		"CREATE": true,
+		"AMEND": true,
+		"CANCEL": true,
+		"copy_dict": true,
+		"get_number_format_info": true,
+		"print_table": true,
+		"Layout": true,
+		"web_form_settings": true,
+		"$c": true,
+		"$a": true,
+		"$i": true,
+		"$bg": true,
+		"$y": true,
+		"$c_obj": true,
+		"$c_obj_csv": true,
+		"refresh_many": true,
+		"refresh_field": true,
+		"toggle_field": true,
+		"get_field_obj": true,
+		"get_query_params": true,
+		"unhide_field": true,
+		"hide_field": true,
+		"set_field_options": true,
+		"getCookie": true,
+		"getCookies": true,
+		"get_url_arg": true,
+		"get_server_fields": true,
+		"set_multiple": true,
+		"QUnit": true
+	}
+}

.github/CONTRIBUTING.md

@@ -1,61 +1,36 @@
-##General Overview
+### Introduction (first timers)
 
-We have three branches where all the work happens: 
+Thank you for your interest in raising an Issue with ERPNext. An Issue could mean a bug report or a request for a missing feature. By raising a bug report, you are contributing to the development of ERPNext and this is the first step of participating in the community. Bug reports are very helpful for developers as they quickly fix the issue before other users start facing it.
 
-* **master** - This is the stable branch based on which we do releases. This branch is for production. 
-* **develop** - This is an unstable branch for development purposes, it has bleeding edge features and fixes, but it's not recommended for production. Bug fixes and new features go here. 
-* **hotfix** - This is a branch dedicated to hotfixes on the master branch. Urgent bug fixes go here. 
+Feature requests are also a great way to take the product forward. New ideas can come in any user scenario and the issue list also acts a roadmap of future features.
 
+When you are raising an Issue, you should keep a few things in mind. Remember that the developer does not have access to your machine so you must give all the information you can while raising an Issue. If you are suggesting a feature, you should be very clear about what you want.
 
-Once we deem the develop branch to be stable, we merge it into the master and do a major release. The hotfix branch is solely for making urgent bug fixes on the current master branch, which we then merge into master.
+The Issue list is not the right place to ask a question or start a general discussion. If you want to do that , then the right place is the forum [https://discuss.erpnext.com](https://discuss.erpnext.com).
 
-We almost never push directly to master.
+### Reply and Closing Policy
 
+If your issue is not clear or does not meet the guidelines, then it will be closed. If it is closed, please supply the information asked and re-open it.
 
-***
+### General Issue Guidelines
 
+1. **Search existing Issues:** Before raising a Issue, search if it has been raised before. Maybe add a 👍 or give additional help by creating a mockup if it is not already created.
+1. **Report each issue separately:** Don't club multiple, unreleated issues in one note.
+1. **Brief:** Please don't include long explanations. Use screenshots and bullet points instead of descriptive paragraphs.
 
-##Workflow
+### Bug Report Guidelines
 
-Contributing to ERPNext is not very different from the usual Pull Request workflow on GitHub.
+1. **Steps to Reproduce:** The bug report must have a list of steps needed to reproduce a bug. If we cannot reproduce it, then we cannot solve it.
+1. **Version Number:** Please add the version number in your report. Often a bug is fixed in the latest version
+1. **Clear Title:** Add a clear subject to your bug report like "Unable to submit Purchase Order without Basic Rate" instead of just "Cannot Submit"
+1. **Screenshots:** Screenshots are a great way of communicating the issues. Try adding annotations or using LiceCAP to take a screencast in `gif`.
 
-###Prerequisites : 
+### Feature Request Guidelines
 
-* You need to know [Git and Github basics](https://try.github.io/levels/1/challenges/1)
-* You need to have a Fork of the [ERPNext repo](https://github.com/frappe/erpnext) in your personal Github account 
-* You need to add a [remote](#glossary) for your Forked repository. `git remote add origin [your-erpnext-repo-url]`
+1. **Clarity:** Clearly specify how do you want the feature to behave. Don't just say "I would like multiple PDF formats", say that "Ability to add multiple print formats for customers with different languages".
+1. **Solution:** Try and identify how the feature should look like.
+1. **Mockups:** Mockups are a great way to explain your requirement.
 
+### What if my Issue is closed
 
-###The Process: 
-
-1. Make sure you're in the right branch. **develop** for adding features /  fixing issues and **hotfix** for urgent bug fixes
-2. Make your changes
-3. Create and checkout a new branch for the changes you've made. `git checkout -b [branch-name]`
-4. Add and commit your changes `git commit -am "[commit-message]"
-5. If you have been working on sometime for a long time, you should [rebase](#glossary) your branch with our develop branch. `git pull upstream develop --rebase` where `upstream` is the remote name of our repo
-6. Now, push your changes to your fork. `git push origin [branch-name]`   
-If you rebased your commits, you will have to [force push](http://vignette2.wikia.nocookie.net/starwars/images/e/ea/Yodapush.png/revision/latest?cb=20130205190454) `git push origin [branch-name] --force`
-7. You should now be able to see your pushed branch on Github, now create a pull request against the branch that you want to merge to.
-8. Wait for us to review it
-
-###Common Problems: 
-
-* During rebase you might face _merge conflicts_. A merge conflict occurs when you have made changes to the same file that someone else has, in the commits you're pulling. You need to resolve these conflicts by picking which code you want to keep, yours or theirs. You can use `git mergetool` for help.
-* Sometimes you don't have a local branch to which you want to make changes to. In that case you first run `git fetch` followed by `git checkout --track -b upstream/[branch-name]`
- 
-
-###Good practices: 
-
-* You should rebase your branch with the branch you plan to make a Pull Request to as often as you can. 
-* Your commit messages should be precise and explain exactly what the commit does. Same goes for the Pull Request title.
-* When making a PR make sure that all your code is committed properly by checking the diffs.
-* If you're working on different things at the same time, make sure you make separate branches for each.
-* Don't create new DocTypes unless absolutely necessary. If you find that there is a another DocType with a similar functionality, then please try and extend that functionality.
-* DRY. Don't Repeat Yourself. Before writing up a similar function /feature make sure it doesn't exist in the codebase already. 
-* Tabs, not spaces.
-
-
-###Glossary
-
-* remote - A remote is a connection to a Github repo. You should have two remotes, one that points to your repo and one to ours. 
-* rebase - When you rebase a branch, you pull commits from your remote branch and move your commits on top of it. This allows you to update your branch with the latest changes without losing  your changes.
+Don't worry, take the feedback, supply the correct information and re-open it!

.travis.yml

@@ -1,48 +1,67 @@
 language: python
 dist: trusty
 
+addons:
+  apt:
+    sources:
+      - google-chrome
+    packages:
+      - google-chrome-stable
+
 python:
   - "2.7"
 
 services:
   - mysql
 
-before_install:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-
 install:
+  - 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 purge -y mysql-common mysql-server mysql-client
-  # - wget https://raw.githubusercontent.com/frappe/bench/master/install_scripts/setup_frappe.sh
-  # - sudo bash setup_frappe.sh --skip-setup-bench --mysql-root-password travis --bench-branch develop
+  - nvm install v7.10.0
   - 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
 
-  # - sudo pip install --upgrade pip
   - rm $TRAVIS_BUILD_DIR/.git/shallow
   - bash $TRAVIS_BUILD_DIR/travis/bench_init.sh
   - cp -r $TRAVIS_BUILD_DIR/test_sites/test_site ~/frappe-bench/sites/
 
-script:
+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
+
   - cd ~/frappe-bench
   - bench get-app erpnext $TRAVIS_BUILD_DIR
   - bench use test_site
   - bench reinstall --yes
   - bench build
+  - bench scheduler disable
   - bench start &
   - sleep 10
-  - bench --verbose run-tests --driver Firefox
 
-before_script:
-  - 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
+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
 
-notifications:
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/92b3bea86d8c5397beef
-    on_success: always
-    on_failure: always
-    on_start: never

CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at hello@frappe.io. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

README.md

@@ -6,10 +6,9 @@
 
 Includes: Accounting, Inventory, Manufacturing, CRM, Sales, Purchase, Project Management, HRMS. Requires MariaDB.
 
-ERPNext is built on the [Frappe](https://github.com/frappe/frappe) Framework, a full-stack web app framework in Python & JavaScript.
+ERPNext is built on the [Frappé](https://github.com/frappe/frappe) Framework, a full-stack web app framework in Python & JavaScript.
 
-- [User Guide](https://manual.erpnext.com)
-- [Getting Help](http://erpnext.org/getting-help.html)
+- [User Guide](https://erpnext.org/docs/user)
 - [Discussion Forum](https://discuss.erpnext.com/)
 
 ---
@@ -34,25 +33,34 @@ System and user credentials are listed on the download page.
 
 GNU/General Public License (see 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 Frappe Technologies Pvt Ltd (Frappe) 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 Frappé Technologies Pvt Ltd (Frappé) and Contributors.
+
+---
+
+## Contributing
+
+1. [Issue Guidelines](https://github.com/frappe/erpnext/wiki/Issue-Guidelines)
+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)
 
 ---
 
 ## Logo and Trademark
 
-The brand name ERPNext and the logo are trademarks of Frappe Technologies Pvt. Ltd.
+The brand name ERPNext and the logo are trademarks of Frappé Technologies Pvt. Ltd.
 
 ### Introduction
 
-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:
+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:
 
 - 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.
 
-### Frappe Trademark Usage Policy
+### Frappé Trademark Usage Policy
 
-Permission from Frappe is required to use the ERPNext name or logo as part of any project, product, service, domain or company name.
+Permission from Frappé 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:
 
@@ -63,7 +71,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 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.”
+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.”
 
 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.
 
@@ -71,6 +79,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 Frappe Technologies for clarification.
+When in doubt about your use of the ERPNext name or logo, please contact Frappé Technologies for clarification.
 
 (inspired by WordPress)

attributions.md

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

erpnext/__init__.py

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+import inspect
 import frappe
+from erpnext.hooks import regional_overrides
 
-__version__ = '7.0.46'
+__version__ = '9.2.1'
 
 def get_default_company(user=None):
 	'''Get default company for user'''
@@ -19,8 +21,90 @@ def get_default_company(user=None):
 
 	return default_company
 
+
 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')
+
+def get_default_cost_center(company):
+	'''Returns the default cost center of the company'''
+	if not company:
+		return None
+
+	if not frappe.flags.company_cost_center:
+		frappe.flags.company_cost_center = {}
+	if not company in frappe.flags.company_cost_center:
+		frappe.flags.company_cost_center[company] = frappe.db.get_value('Company', company, 'cost_center')
+	return frappe.flags.company_cost_center[company]
+
+def get_company_currency(company):
+	'''Returns the default company currency'''
+	if not frappe.flags.company_currency:
+		frappe.flags.company_currency = {}
+	if not company in frappe.flags.company_currency:
+		frappe.flags.company_currency[company] = frappe.db.get_value('Company', company, 'default_currency')
+	return frappe.flags.company_currency[company]
+
+def set_perpetual_inventory(enable=1, company=None):
+	if not company:
+		company = "_Test Company" if frappe.flags.in_test else get_default_company()
+
+	company = frappe.get_doc("Company", company)
+	company.enable_perpetual_inventory = enable
+	company.save()
+
+def encode_company_abbr(name, company):
+	'''Returns name encoded with company abbreviation'''
+	company_abbr = frappe.db.get_value("Company", company, "abbr")
+	parts = name.rsplit(" - ", 1)
+
+	if parts[-1].lower() != company_abbr.lower():
+		parts.append(company_abbr)
+
+	return " - ".join(parts)
+
+def is_perpetual_inventory_enabled(company):
+	if not company:
+		company = "_Test Company" if frappe.flags.in_test else get_default_company()
+
+	if not hasattr(frappe.local, 'enable_perpetual_inventory'):
+		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
+
+	return frappe.local.enable_perpetual_inventory[company]
+
+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')
+	elif frappe.flags.country:
+		return frappe.flags.country
+	else:
+		return frappe.get_system_settings('country')
+
+def allow_regional(fn):
+	'''Decorator to make a function regionally overridable
+
+	Example:
+	@erpnext.allow_regional
+	def myfunction():
+	  pass'''
+	def caller(*args, **kwargs):
+		region = get_region()
+		fn_name = inspect.getmodule(fn).__name__ + '.' + fn.__name__
+		if region in regional_overrides and fn_name in regional_overrides[region]:
+			return frappe.get_attr(regional_overrides[region][fn_name])(*args, **kwargs)
+		else:
+			return fn(*args, **kwargs)
+
+	return caller
+

erpnext/accounts/doctype/account/account.js

@@ -1,94 +1,95 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-
-cur_frm.cscript.refresh = function(doc, cdt, cdn) {
-	if(doc.__islocal) {
-		msgprint(__("Please create new account from Chart of Accounts."));
-		throw "cannot create";
-	}
-
-	cur_frm.toggle_display('account_name', doc.__islocal);
-
-	// hide fields if group
-	cur_frm.toggle_display(['account_type', 'tax_rate'], cint(doc.is_group)==0)
-
-	// disable fields
-	cur_frm.toggle_enable(['account_name', 'is_group', 'company'], false);
-
-	if(cint(doc.is_group)==0) {
-		cur_frm.toggle_display('freeze_account', doc.__onload && doc.__onload.can_freeze_account);
-	}
-
-	// read-only for root accounts
-	if(!doc.parent_account) {
-		cur_frm.set_read_only();
-		cur_frm.set_intro(__("This is a root account and cannot be edited."));
-	} else {
-		// credit days and type if customer or supplier
-		cur_frm.set_intro(null);
-
-		cur_frm.cscript.account_type(doc, cdt, cdn);
-
-		// show / hide convert buttons
-		cur_frm.cscript.add_toolbar_buttons(doc);
-	}
-}
-
-cur_frm.add_fetch('parent_account', 'report_type', 'report_type');
-cur_frm.add_fetch('parent_account', 'root_type', 'root_type');
-
-cur_frm.cscript.account_type = function(doc, cdt, cdn) {
-	if(doc.is_group==0) {
-		cur_frm.toggle_display(['tax_rate'], doc.account_type == 'Tax');
-		cur_frm.toggle_display('warehouse', doc.account_type=='Stock');
-	}
-}
-
-cur_frm.cscript.add_toolbar_buttons = function(doc) {
-	cur_frm.add_custom_button(__('Chart of Accounts'),
-		function() { frappe.set_route("Tree", "Account"); });
-
-	if (doc.is_group == 1) {
-		cur_frm.add_custom_button(__('Group to Non-Group'),
-			function() { cur_frm.cscript.convert_to_ledger(); }, 'icon-retweet', 'btn-default');
-	} else if (cint(doc.is_group) == 0) {
-		cur_frm.add_custom_button(__('Ledger'), function() {
-			frappe.route_options = {
-				"account": doc.name,
-				"from_date": sys_defaults.year_start_date,
-				"to_date": sys_defaults.year_end_date,
-				"company": doc.company
+frappe.ui.form.on('Account', {
+	setup: function(frm) {
+		frm.add_fetch('parent_account', 'report_type', 'report_type');
+		frm.add_fetch('parent_account', 'root_type', 'root_type');
+	},
+	onload: function(frm) {
+		frm.set_query('parent_account', function(doc) {
+			return {
+				filters: {
+					"is_group": 1,
+					"company": doc.company
+				}
 			};
-			frappe.set_route("query-report", "General Ledger");
 		});
-
-		cur_frm.add_custom_button(__('Non-Group to Group'),
-			function() { cur_frm.cscript.convert_to_group(); }, 'icon-retweet', 'btn-default')
-	}
-}
-
-cur_frm.cscript.convert_to_ledger = function(doc, cdt, cdn) {
-  return $c_obj(cur_frm.doc,'convert_group_to_ledger','',function(r,rt) {
-    if(r.message == 1) {
-	  cur_frm.refresh();
-    }
-  });
-}
-
-cur_frm.cscript.convert_to_group = function(doc, cdt, cdn) {
-  return $c_obj(cur_frm.doc,'convert_ledger_to_group','',function(r,rt) {
-    if(r.message == 1) {
-	  cur_frm.refresh();
-    }
-  });
-}
-
-cur_frm.fields_dict['parent_account'].get_query = function(doc) {
-	return {
-		filters: {
-			"is_group": 1,
-			"company": doc.company
+	},
+	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);
+
+		// 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);
+
+		if (cint(frm.doc.is_group) == 0) {
+			frm.toggle_display('freeze_account', frm.doc.__onload
+				&& frm.doc.__onload.can_freeze_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');
+		}
+	},
+	account_type: function (frm) {
+		if (frm.doc.is_group == 0) {
+			frm.toggle_display(['tax_rate'], frm.doc.account_type == 'Tax');
+			frm.toggle_display('warehouse', frm.doc.account_type == 'Stock');
+		}
+	},
+	add_toolbar_buttons: function(frm) {
+		frm.add_custom_button(__('Chart of Accounts'),
+			function () { frappe.set_route("Tree", "Account"); });
+
+		if (frm.doc.is_group == 1) {
+			frm.add_custom_button(__('Group to Non-Group'), function () {
+				return frappe.call({
+					doc: frm.doc,
+					method: 'convert_group_to_ledger',
+					callback: function() {
+						frm.refresh();
+					}
+				});
+			});
+		} else if (cint(frm.doc.is_group) == 0
+			&& frappe.boot.user.can_read.indexOf("GL Entry") !== -1) {
+			cur_frm.add_custom_button(__('Ledger'), function () {
+				frappe.route_options = {
+					"account": frm.doc.name,
+					"from_date": frappe.sys_defaults.year_start_date,
+					"to_date": frappe.sys_defaults.year_end_date,
+					"company": frm.doc.company
+				};
+				frappe.set_route("query-report", "General Ledger");
+			});
+
+			frm.add_custom_button(__('Non-Group to Group'), function () {
+				return frappe.call({
+					doc: frm.doc,
+					method: 'convert_ledger_to_group',
+					callback: function() {
+						frm.refresh();
+					}
+				});
+			});
+		}
+
 	}
-}
+});

erpnext/accounts/doctype/account/account.json

@@ -1,5 +1,6 @@
 {
  "allow_copy": 1, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 1, 
  "beta": 0, 
@@ -9,18 +10,23 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "properties", 
    "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, 
@@ -29,6 +35,7 @@
    "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, 
@@ -36,22 +43,27 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -60,16 +72,20 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "account_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Account Name", 
    "length": 0, 
    "no_copy": 1, 
@@ -79,6 +95,7 @@
    "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, 
@@ -86,9 +103,11 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "0", 
    "fieldname": "is_group", 
    "fieldtype": "Check", 
@@ -96,7 +115,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -105,6 +126,7 @@
    "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, 
@@ -112,16 +134,20 @@
    "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": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -132,6 +158,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 1, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -139,16 +166,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "root_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": 1, 
    "label": "Root Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -157,6 +188,7 @@
    "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, 
@@ -164,16 +196,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "report_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": 1, 
    "label": "Report Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -182,6 +218,7 @@
    "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, 
@@ -189,9 +226,11 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.is_group==0", 
    "fieldname": "account_currency", 
    "fieldtype": "Link", 
@@ -199,7 +238,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -209,6 +250,7 @@
    "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, 
@@ -216,22 +258,27 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -240,16 +287,20 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "parent_account", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 1, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Parent Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -260,6 +311,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 1, 
@@ -267,17 +319,21 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Setting Account Type helps in selecting this Account in transactions.", 
    "fieldname": "account_type", 
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Account Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -288,6 +344,7 @@
    "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, 
@@ -295,9 +352,11 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Rate at which this tax is applied", 
    "fieldname": "tax_rate", 
    "fieldtype": "Float", 
@@ -305,7 +364,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -315,6 +376,7 @@
    "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, 
@@ -322,9 +384,11 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "If the account is frozen, entries are allowed to restricted users.", 
    "fieldname": "freeze_account", 
    "fieldtype": "Select", 
@@ -332,7 +396,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Frozen", 
    "length": 0, 
    "no_copy": 0, 
@@ -343,6 +409,7 @@
    "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, 
@@ -350,41 +417,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "warehouse", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Warehouse", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Warehouse", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 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": "balance_must_be", 
    "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": "Balance must be", 
    "length": 0, 
    "no_copy": 0, 
@@ -393,6 +439,7 @@
    "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, 
@@ -400,16 +447,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "lft", 
    "fieldtype": "Int", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Lft", 
    "length": 0, 
    "no_copy": 0, 
@@ -417,6 +468,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -424,16 +476,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "rgt", 
    "fieldtype": "Int", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rgt", 
    "length": 0, 
    "no_copy": 0, 
@@ -441,6 +497,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -448,16 +505,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "old_parent", 
    "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": "Old Parent", 
    "length": 0, 
    "no_copy": 0, 
@@ -465,6 +526,7 @@
    "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, 
@@ -472,18 +534,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-money", 
+ "icon": "fa fa-money", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-06-24 13:33:45.504882", 
+ "modified": "2017-08-11 15:28:35.855809", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Account", 
@@ -594,6 +656,8 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "", 
+ "show_name_in_global_search": 1, 
  "sort_order": "ASC", 
+ "track_changes": 1, 
  "track_seen": 0
 }

erpnext/accounts/doctype/account/account.py

@@ -3,11 +3,12 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.utils import cstr, cint
+from frappe.utils import cint, fmt_money
 from frappe import throw, _
 from frappe.model.document import Document
 
 class RootNotEditable(frappe.ValidationError): pass
+class BalanceMismatchError(frappe.ValidationError): pass
 
 class Account(Document):
 	nsm_parent_field = 'parent_account'
@@ -34,7 +35,6 @@ class Account(Document):
 		self.validate_group_or_ledger()
 		self.set_root_and_report_type()
 		self.validate_mandatory()
-		self.validate_warehouse_account()
 		self.validate_frozen_accounts_modifier()
 		self.validate_balance_must_be_debit_or_credit()
 		self.validate_account_currency()
@@ -161,31 +161,6 @@ class Account(Document):
 		if not self.report_type:
 			throw(_("Report Type is mandatory"))
 
-	def validate_warehouse_account(self):
-		if not cint(frappe.defaults.get_global_default("auto_accounting_for_stock")):
-			return
-			
-		if self.account_type == "Stock" and not cint(self.is_group):
-			if not self.warehouse:
-				throw(_("Warehouse is mandatory"))
-				
-			old_warehouse = cstr(frappe.db.get_value("Account", self.name, "warehouse"))
-			if old_warehouse != cstr(self.warehouse):
-				if old_warehouse:
-					self.validate_warehouse(old_warehouse)
-				if self.warehouse:
-					self.validate_warehouse(self.warehouse)
-					
-		elif self.warehouse:
-			self.warehouse = None
-	
-	def validate_warehouse(self, warehouse):
-		lft, rgt = frappe.db.get_value("Warehouse", warehouse, ["lft", "rgt"])
-
-		if lft and rgt:
-			if frappe.db.sql_list("""select sle.name from `tabStock Ledger Entry` sle where exists (select wh.name from
-				tabWarehouse wh where lft >= %s and rgt <= %s and sle.warehouse = wh.name)""", (lft, rgt)):
-				throw(_("Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it").format(warehouse))
 
 	def update_nsm_model(self):
 		"""update lft, rgt indices for nested set model"""

erpnext/accounts/doctype/account/account_tree.js

@@ -1,3 +1,5 @@
+frappe.provide("frappe.treeview_settings")
+
 frappe.treeview_settings["Account"] = {
 	breadcrumbs: "Accounts",
 	title: __("Chart Of Accounts"),
@@ -25,18 +27,20 @@ frappe.treeview_settings["Account"] = {
 		{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')},
+			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: ['', 'Bank', 'Cash', 'Stock', 'Tax', 'Chargeable', 'Fixed Asset'].join('\n'),
+			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'),
 			description: __("Optional. This setting will be used to filter in various transactions.")
 		},
 		{fieldtype:'Float', fieldname:'tax_rate', label:__('Tax Rate'),
-			depends_on: 'eval:doc.is_group==1&&doc.account_type=="Tax"'},
-		{fieldtype:'Link', fieldname:'warehouse', label:__('Warehouse'), options:"Warehouse",
-			depends_on: 'eval:(!doc.is_group&&doc.account_type=="Warehouse")'},
+			depends_on: 'eval:doc.is_group==0&&doc.account_type=="Tax"'},
 		{fieldtype:'Link', fieldname:'account_currency', label:__('Currency'), options:"Currency",
 			description: __("Optional. Sets company's default currency, if not specified.")}
 	],
+	ignore_fields:["parent_account"],
 	onrender: function(node) {
 		var dr_or_cr = node.data.balance < 0 ? "Cr" : "Dr";
 		if (node.data && node.data.balance!==undefined) {
@@ -48,5 +52,24 @@ frappe.treeview_settings["Account"] = {
 				+ " " + dr_or_cr
 				+ '</span>').insertBefore(node.$ul);
 		}
-	}
-}
+	},
+	toolbar: [
+		{
+			condition: function(node) {
+				return !node.root && frappe.boot.user.can_read.indexOf("GL Entry") !== -1
+			},
+			label: __("View Ledger"),
+			click: function(node, btn) {
+				frappe.route_options = {
+					"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'): ""
+				};
+				frappe.set_route("query-report", "General Ledger");
+			},
+			btnClass: "hidden-xs"
+		}
+	],
+	extend_toolbar: true
+}

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

@@ -6,9 +6,8 @@ import frappe, os, json
 from frappe.utils import cstr
 from unidecode import unidecode
 
-def create_charts(chart_name, company):
-	chart = get_chart(chart_name)
-	
+def create_charts(company, chart_template=None, existing_company=None):
+	chart = get_chart(chart_template, existing_company)
 	if chart:
 		accounts = []
 
@@ -17,7 +16,7 @@ def create_charts(chart_name, company):
 				if root_account:
 					root_type = child.get("root_type")
 
-				if account_name not in ["account_type", "root_type", "is_group"]:
+				if account_name not in ["account_type", "root_type", "is_group", "tax_rate"]:
 
 					account_name_in_db = unidecode(account_name.strip().lower())
 					if account_name_in_db in accounts:
@@ -57,16 +56,19 @@ def create_charts(chart_name, company):
 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"])):
+	elif len(set(child.keys()) - set(["account_type", "root_type", "is_group", "tax_rate"])):
 		is_group = 1
 	else:
 		is_group = 0
 
 	return is_group
 
-def get_chart(chart_name):
+def get_chart(chart_template, existing_company=None):
 	chart = {}
-	if chart_name == "Standard":
+	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()
 	else:
@@ -76,10 +78,11 @@ def get_chart(chart_name):
 		for folder in folders:
 			path = os.path.join(os.path.dirname(__file__), folder)
 			for fname in os.listdir(path):
+				fname = frappe.as_unicode(fname)
 				if fname.endswith(".json"):
 					with open(os.path.join(path, fname), "r") as f:
 						chart = f.read()
-						if chart and json.loads(chart).get("name") == chart_name:
+						if chart and json.loads(chart).get("name") == chart_template:
 							return json.loads(chart).get("tree")
 
 @frappe.whitelist()
@@ -103,7 +106,8 @@ def get_charts_for_country(country):
 			path = os.path.join(os.path.dirname(__file__), folder)
 
 			for fname in os.listdir(path):
-				if fname.startswith(country_code) and fname.endswith(".json"):
+				fname = frappe.as_unicode(fname)
+				if (fname.startswith(country_code) or fname.startswith(country)) and fname.endswith(".json"):
 					with open(os.path.join(path, fname), "r") as f:
 						_get_chart_name(f.read())
 
@@ -111,3 +115,47 @@ def get_charts_for_country(country):
 		charts.append("Standard")
 
 	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"], 
+		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
+
+	# 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_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)

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

@@ -4,7 +4,7 @@
 """
 Import chart of accounts from OpenERP sources
 """
-from __future__ import unicode_literals
+from __future__ import print_function, unicode_literals
 
 import os, json
 import ast
@@ -84,7 +84,7 @@ def get_csv_contents(files_path):
 					try:
 						csv_content.setdefault(file_type, [])\
 							.append(read_csv_content(csvfile.read()))
-					except Exception, e:
+					except Exception as e:
 						continue
 	return csv_content
 
@@ -229,7 +229,7 @@ def make_charts():
 
 		filename = src["id"][5:] + "_" + chart_id
 
-		print "building " + filename
+		print("building " + filename)
 		chart = {}
 		chart["name"] = src["name"]
 		chart["country_code"] = src["id"][5:]

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

@@ -1,153 +0,0 @@
-{
-    "country_code": "ca",
-    "name": "Canada - Plan comptable pour les provinces francophones",
-    "tree": {
-        "ACTIF": {
-            "ACTIFS COURANTS": {
-                "CERTIFICATS DE D\u00c9P\u00d4TS": {},
-                "COMPTES CLIENTS": {
-                    "Comptes clients": {
-                        "account_type": "Receivable"
-                    },
-                    "PROVISION POUR CR\u00c9ANCES DOUTEUSES": {}
-                },
-                "ENCAISSE": {},
-                "FRAIS PAY\u00c9S D'AVANCE": {},
-                "IMP\u00d4TS \u00c0 RECEVOIR": {
-                    "TPS \u00e0 recevoir": {},
-                    "TVH \u00e0 recevoir": {
-                        "TVH \u00e0 recevoir - 13%": {},
-                        "TVH \u00e0 recevoir - 14%": {},
-                        "TVH \u00e0 recevoir - 15%": {}
-                    },
-                    "TVP/TVQ \u00e0 recevoir": {}
-                },
-                "PLACEMENTS D\u00c9TENUS \u00c0 DES FINS DE TRANSACTION": {},
-                "STOCKS": {
-                    "Stock": {},
-                    "Stock exp\u00e9di\u00e9 non-factur\u00e9": {}
-                },
-                "TR\u00c9SORERIE OU \u00c9QUIVALENTS DE TR\u00c9SORERIE": {}
-            },
-            "ACTIFS NON-COURANTS": {
-                "IMMOBILISATIONS CORPORELLES": {
-                    "AMORTISSEMENTS CUMUL\u00c9S": {}
-                },
-                "IMMOBILISATIONS INCORPORELLES": {
-                    "BREVETS, MARQUES DE COMMERCE ET DROITS D'AUTEURS": {}
-                },
-                "PLACEMENTS DISPONIBLES \u00c0 LA VENTE": {}
-            },
-            "root_type": "Asset"
-        },
-        "CAPITAUX PROPRES": {
-            "AUTRES \u00c9L\u00c9MENTS DU R\u00c9SULTAT GLOBAL": {},
-            "B\u00c9N\u00c9FICES NON R\u00c9PARTIS": {},
-            "CAPITAL-ACTIONS": {},
-            "DIVIDENDES": {},
-            "PRIMES": {},
-            "SURPLUS D'APPORT": {},
-            "root_type": "Equity",
-            "\u00c9CARTS DE CONVERSION": {}
-        },
-        "CHARGES": {
-            "CHARGES D'EXPLOITATION": {
-                "AUTRES FRAIS D'EXPLOITATION": {},
-                "CO\u00dbT DES PRODUITS VENDUS": {
-                    "Achats": {},
-                    "Achats dans des provinces harmonis\u00e9es": {},
-                    "Achats dans des provinces non-harmonis\u00e9es": {},
-                    "Achats \u00e0 l'\u00e9tranger": {}
-                },
-                "FRAIS DE RECHERCHE ET D\u00c9VELOPPEMENT": {},
-                "FRAIS G\u00c9N\u00c9RAUX": {},
-                "FRAIS SUR VENTE": {},
-                "SALAIRES ET CHARGES SOCIALES": {
-                    "Assurance Emploi": {},
-                    "Assurance parentale": {},
-                    "Fonds des services de sant\u00e9": {},
-                    "Imp\u00f4t f\u00e9d\u00e9ral": {},
-                    "Imp\u00f4t provincial": {},
-                    "Normes du travail": {},
-                    "Rentes": {},
-                    "Salaires": {},
-                    "Sant\u00e9 et s\u00e9curit\u00e9 au travail": {},
-                    "Vacances": {}
-                }
-            },
-            "FRAIS NON LI\u00c9S \u00c0 L'EXPLOITATION": {
-                "AUTRES FRAIS NON LI\u00c9S \u00c0 L'EXPLOITATION": {},
-                "INT\u00c9R\u00caTS D\u00c9BITEURS": {}
-            },
-            "root_type": "Expense"
-        },
-        "PASSIF": {
-            "PASSIFS COURANTS": {
-                "AUTRES COMPTES CR\u00c9DITEURS": {},
-                "DETTES FINANCI\u00c8RES COURANTES": {},
-                "FOURNISSEURS ET COMPTES RATTACH\u00c9S": {
-                    "Comptes fournisseurs": {
-                        "account_type": "Payable"
-                    }
-                },
-                "IMP\u00d4TS LI\u00c9S AUX SALAIRES \u00c0 PAYER": {
-                    "AGENCE DU REVENU DU CANADA": {
-                        "ASSURANCE EMPLOI \u00c0 PAYER": {
-                            "AE - Contribution de l'employeur": {},
-                            "AE - Contribution des employ\u00e9s": {}
-                        },
-                        "Imp\u00f4t f\u00e9d\u00e9ral sur les revenus": {}
-                    },
-                    "AGENCE DU REVENU PROVINCIAL": {
-                        "ASSURANCE PARENTALE \u00c0 PAYER": {
-                            "AP - Contribution de l'employeur": {},
-                            "AP - Contribution des employ\u00e9s": {}
-                        },
-                        "Fond des Services de Sant\u00e9 \u00e0 payer": {},
-                        "Imp\u00f4t provincial sur les revenus": {},
-                        "Normes du Travail \u00e0 payer": {},
-                        "RENTES \u00c0 PAYER": {
-                            "Rentes - Contribution de l'employeur": {},
-                            "Rentes - Contribution des employ\u00e9s": {}
-                        },
-                        "Sant\u00e9 et S\u00e9curit\u00e9 au Travail \u00e0 payer": {}
-                    }
-                },
-                "IMP\u00d4TS \u00c0 PAYER": {
-                    "TPS \u00e0 payer": {},
-                    "TVH \u00e0 payer": {
-                        "TVH \u00e0 payer - 13%": {},
-                        "TVH \u00e0 payer - 14%": {},
-                        "TVH \u00e0 payer - 15%": {}
-                    },
-                    "TVP/TVQ \u00e0 payer": {}
-                },
-                "PASSIFS DE STOCK": {
-                    "Stock re\u00e7u non factur\u00e9": {}
-                },
-                "PASSIFS LI\u00c9S AUX ACTIFS D\u00c9TENUS EN VUE DE LEUR CESSION": {}
-            },
-            "PASSIFS NON-COURANTS": {
-                "AUTRES PASSIFS NON-COURANTS": {},
-                "DETTES FINANCI\u00c8RES NON-COURANTES": {},
-                "IMP\u00d4TS DIFF\u00c9R\u00c9S": {},
-                "PROVISIONS POUR RETRAITES ET AUTRES AVANTAGES POST\u00c9RIEURS \u00c0 L'EMPLOI": {}
-            },
-            "root_type": "Liability"
-        },
-        "PRODUITS": {
-            "PRODUITS D'EXPLOITATION": {
-                "AUTRES PRODUITS D'EXPLOITATION": {},
-                "Ventes": {},
-                "Ventes avec des provinces harmonis\u00e9es": {},
-                "Ventes avec des provinces non-harmonis\u00e9es": {},
-                "Ventes \u00e0 l'\u00e9tranger": {}
-            },
-            "PRODUITS NON LI\u00c9S \u00c0 L'EXPLOITATION": {
-                "AUTRES PRODUITS NON LI\u00c9S \u00c0 L'EXPLOITATION": {},
-                "INT\u00c9R\u00caTS": {}
-            },
-            "root_type": "Income"
-        }
-    }
-}

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

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

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

@@ -0,0 +1,419 @@
+{
+    "country_code": "ar", 
+    "name": "Argentina - Chart of Accounts", 
+    "tree": {
+        "1.0.0.00.00 - ACTIVO": {
+            "1.1.0.00.00 - ACTIVO CORRIENTE": {
+                "1.1.1.00.00 - CAJA Y BANCOS": {
+                    "1.1.1.01.00 - CAJAS": {
+                        "1.1.1.01.01 - Caja": {}, 
+                        "1.1.1.01.02 - Caja chica": {}, 
+                        "1.1.1.01.03 - Caja en Moneda Extranjera": {}, 
+                        "1.1.1.01.04 - Valores a depositar": {}, 
+                        "1.1.1.01.05 - Tarjetas - Cupones": {}, 
+                        "account_type": "Cash"
+                    }, 
+                    "1.1.1.02.00 - BANCOS": {
+                        "1.1.1.02.01 - Banco de la Nacio\u0301n Argentina(ejemplo) c/c en": {}, 
+                        "1.1.1.02.03 - Banco del exterior": {}, 
+                        "account_type": "Bank"
+                    }
+                }, 
+                "1.1.2.00.00 - INVERSIONES TEMPORARIAS": {
+                    "1.1.2.01.00 - INVERSIONES EN ACCIONES": {
+                        "1.1.2.01.01 - Acciones": {
+                            "account_type": "Receivable"
+                        }
+                    }, 
+                    "1.1.2.02.00 - DEPO\u0301SITOS A PLAZO FIJO": {
+                        "1.1.2.02.01 - Depo\u0301sitos a Plazo Fijo en pesos": {
+                            "account_type": "Receivable"
+                        }, 
+                        "1.1.2.02.02 - Depo\u0301sitos a Plazo Fijo en moneda": {
+                            "account_type": "Receivable"
+                        }
+                    }
+                }, 
+                "1.1.3.00.00 - CRE\u0301DITOS POR VENTAS DE SERVICIOS": {
+                    "1.1.3.01.00 - DEUDORES EN CTA. CTE": {
+                        "1.1.3.01.01 - Deudores locales": {
+                            "account_type": "Receivable"
+                        }, 
+                        "1.1.3.01.02 - Deudores del exterior": {
+                            "account_type": "Receivable"
+                        }, 
+                        "1.1.3.01.03 - Deudores Morosos": {
+                            "account_type": "Chargeable"
+                        }, 
+                        "1.1.3.01.04 - Deudores en Gestio\u0301n Judicial": {}
+                    }, 
+                    "1.1.3.02.00 - Documentos a cobrar por Vas. de Servicios": {
+                        "account_type": "Receivable"
+                    }, 
+                    "1.1.3.03.00 - Previsio\u0301n para deudores incobrables": {}
+                }, 
+                "1.1.4.00.00 - OTROS CRE\u0301DITOS CORRIENTES": {
+                    "1.1.4.01.00 - CRE\u0301DITOS IMPOSITIVOS CORRIENTES": {
+                        "1.1.4.01.01 - Anticipos Impuesto a las Ganancias": {}, 
+                        "1.1.4.01.02 - Anticipos Impuesto a los Ingresos Brutos": {}, 
+                        "1.1.4.01.03 - Percepciones y Retenciones Impto. a las Ganancias": {}, 
+                        "1.1.4.01.04 - Percepciones y Retenciones Impto. a los": {}, 
+                        "1.1.4.01.05 - IVA Cre\u0301dito Fiscal": {}, 
+                        "1.1.4.01.06 - IVA Cre\u0301dito Fiscal Exportacio\u0301n": {}, 
+                        "1.1.4.01.07 - IVA Saldo a Favor Te\u0301cnico": {}, 
+                        "1.1.4.01.08 - IVA Saldo a Favor Te\u0301cnico": {}, 
+                        "1.1.4.01.09 - IVA Saldo a Favor de Libre": {}, 
+                        "1.1.4.01.10 - Percepciones y Retenciones de IVA": {}, 
+                        "1.1.4.01.11 - Cre\u0301ditos por quebrantos impositivos no": {}, 
+                        "1.1.4.01.12 - Activos por Impuesto Diferido (Ctes.)": {}
+                    }, 
+                    "1.1.4.02.00 - CRE\u0301DITOS DIVERSOS CORRIENTES": {
+                        "1.1.4.02.01 - Cuentas Particulares Directores": {}, 
+                        "1.1.4.02.02 - Cuentas Particulares Socios/Accionistas": {}, 
+                        "1.1.4.02.03 - Anticipos a Proveedores (No cong.": {
+                            "account_type": "Receivable"
+                        }, 
+                        "1.1.4.02.04 - Anticipos de Sueldos": {}, 
+                        "1.1.4.02.05 - Pre\u0301stamos al personal": {}, 
+                        "1.1.4.02.06 - Depo\u0301sitos pendientes de acreditacio\u0301n": {}, 
+                        "1.1.4.02.07 - Arrendamiento pagado por adelantado": {}
+                    }
+                }, 
+                "1.1.5.00.00 - OTROS ACTIVOS CORRIENTES": {
+                    "is_group": 1
+                }, 
+                "1.1.6.00.00 - INVENTARIOS": {
+                    "account_type": "Stock", 
+                    "is_group": 1
+                }
+            }, 
+            "1.2.0.00.00 - ACTIVO NO CORRIENTE": {
+                "1.2.1.00.00 - INVERSIONES PERMANENTES": {
+                    "1.2.1.01.00 - BONOS DE DEUDA": {
+                        "1.2.1.01.01 - Ti\u0301tulos Deuda Pu\u0301blica (Pesos)": {
+                            "is_group": 1
+                        }, 
+                        "1.2.1.01.02 - Bonex": {}
+                    }, 
+                    "1.2.1.02.00 - DEPO\u0301SITOS A PLAZO FIJO NO": {
+                        "1.2.1.02.01 - Depo\u0301sitos a plazo fijo en pesos (no cte.)": {}, 
+                        "1.2.1.02.02 - Depo\u0301sitos a plazo fijo en moneda": {}
+                    }, 
+                    "1.2.1.03.00 - INVERSIONES EN BIENES DEPRECIABLES": {
+                        "1.2.1.03.01 - Inversiones en Inmuebles Valores": {}, 
+                        "1.2.1.03.02 - Inversiones en Inmuebles": {}, 
+                        "1.2.1.03.03 - Amortizaciones Acumuladas Inversiones": {}
+                    }
+                }, 
+                "1.2.2.00.00 - BIENES DE USO": {
+                    "1.2.2.01.00 - INMUEBLES": {
+                        "1.2.2.01.01 - Inmuebles Valores originales": {
+                            "account_type": "Fixed Asset"
+                        }, 
+                        "1.2.2.01.02 - Inmuebles Actualizaciones": {}, 
+                        "1.2.2.01.03 - Amortizaciones Acumuladas Inmuebles": {
+                            "account_type": "Depreciation"
+                        }
+                    }, 
+                    "1.2.2.02.00 - MAQUINARIAS Y EQUIPOS": {
+                        "1.2.2.02.01 - Maquinarias y Equipos Valores de origen": {
+                            "account_type": "Fixed Asset"
+                        }, 
+                        "1.2.2.02.02 - Maquinarias y Equipos Actualizaciones": {}, 
+                        "1.2.2.02.03 - Amortizaciones Acumuladas Maquinarias": {
+                            "account_type": "Depreciation"
+                        }
+                    }, 
+                    "1.2.2.03.00 - MUEBLES Y U\u0301TILES": {
+                        "1.2.2.03.01 - Muebles y U\u0301tiles Valores de Origen": {
+                            "account_type": "Fixed Asset"
+                        }, 
+                        "1.2.2.03.02 - Muebles y U\u0301tiles Actualizaciones": {}, 
+                        "1.2.2.03.03 - Amortizaciones Acumuladas Muebles y": {
+                            "account_type": "Depreciation"
+                        }
+                    }, 
+                    "1.2.2.04.00 - RODADOS": {
+                        "1.2.2.04.01 - Rodados Valores Originales": {
+                            "account_type": "Fixed Asset"
+                        }, 
+                        "1.2.2.04.02 - Rodados Actualizaciones": {}, 
+                        "1.2.2.04.03 - Amortizaciones Acumuladas Rodados": {
+                            "account_type": "Depreciation"
+                        }
+                    }, 
+                    "1.2.2.07.00 - TERRENOS": {
+                        "1.2.2.07.01 - Terrenos Valores Originales": {
+                            "account_type": "Fixed Asset"
+                        }, 
+                        "1.2.2.07.02 - Terrenos Actualizaciones": {}
+                    }, 
+                    "1.2.2.08.00 - INSTALACIONES": {
+                        "1.2.2.08.01 - Instalaciones Valores Originales": {
+                            "account_type": "Fixed Asset"
+                        }, 
+                        "1.2.2.08.02 - Instalaciones Ajuste": {}, 
+                        "1.2.2.08.03 - Amortizaciones Acumuladas": {
+                            "account_type": "Depreciation"
+                        }
+                    }, 
+                    "1.2.2.09.00 - HERRAMIENTAS": {
+                        "1.2.2.09.01 - Herramientas Valores Originales": {
+                            "account_type": "Fixed Asset"
+                        }, 
+                        "1.2.2.09.02 - Herramientas Ajuste": {}, 
+                        "1.2.2.09.03 - Amortizaciones Acumuladas": {
+                            "account_type": "Depreciation"
+                        }
+                    }
+                }, 
+                "1.2.3.00.00 - ACTIVOS INTANGIBLES": {
+                    "1.2.3.01.00 - MARCAS Y PATENTES": {
+                        "1.2.3.01.01 - Marcas y Patentes Valores Originales": {}, 
+                        "1.2.3.01.02 - Marcas y Patentes Actualizaciones": {}, 
+                        "1.2.3.01.03 - Amortizaciones Acumuladas Marcas y": {}
+                    }
+                }, 
+                "1.2.4.00.00 - CRE\u0301DITOS POR VENTA DE SERVICIOS": {
+                    "1.2.4.01.00 - DEUDORES NO CORRIENTES": {
+                        "1.2.4.01.01 - Deudores Locales (No Ctes.)": {}
+                    }, 
+                    "1.2.4.02.00 - Documentos a cobrar por Vtas. de Servicios": {}
+                }, 
+                "1.2.5.00.00 - OTROS CRE\u0301DITOS NO CORRIENTES": {
+                    "1.2.5.01.00 - CRE\u0301DITOS IMPOSITIVOS NO CORRIENTES": {
+                        "1.2.5.01.01 - Activos por Impto. Diferido (No Ctes.)": {}, 
+                        "1.2.5.01.02 - Cre\u0301ditos por Quebrantos Impositivos no": {}
+                    }, 
+                    "1.2.5.02.00 - CRE\u0301DITOS DIVERSOS NO CORRIENTES": {
+                        "1.2.5.02.01 - Cuentas Particulares Directores (No": {}, 
+                        "1.2.5.02.02 - Cuentas Particulares Socios/Accionistas": {}
+                    }
+                }, 
+                "1.2.6.00.00 - OTROS ACTIVOS NO CORRIENTES": {
+                    "1.2.6.01.00 - Llave de Negocio": {}
+                }
+            }, 
+            "root_type": "Asset"
+        }, 
+        "2.0.0.00.00 - PASIVO": {
+            "2.1.0.00.00 - PASIVO CORRIENTE": {
+                "2.1.1.00.00 - DEUDAS COMERCIALES CORRIENTES": {
+                    "2.1.1.02.00 - ACREEDORES": {
+                        "2.1.1.02.01 - Acreedores Locales (Ctes.)": {
+                            "account_type": "Payable"
+                        }
+                    }
+                }, 
+                "2.1.2.00.00 - REMUNERACIONES Y CAGAS SOCIALES": {
+                    "2.1.2.02.00 - DEUDAS PREVISIONALES": {
+                        "2.1.2.02.01 - Jubilaciones a pagar": {}, 
+                        "2.1.2.02.02 - ART a pagar": {}, 
+                        "2.1.2.02.03 - Obra Social a pagar": {}, 
+                        "2.1.2.02.04 - SAC a pagar": {}, 
+                        "2.1.2.02.05 - Vacaciones a pagar": {}
+                    }, 
+                    "2.1.2.03.00 - Sueldos y Jornales a pagar": {
+                        "account_type": "Chargeable"
+                    }
+                }, 
+                "2.1.3.00.00 - CARGAS FISCALES": {
+                    "2.1.3.01.00 - IMPUESTO AL VALOR AGREGADO": {
+                        "2.1.3.01.01 - IVA De\u0301bito Fiscal": {}, 
+                        "2.1.3.01.02 - IVA De\u0301bito Fiscal Sobretasa": {}, 
+                        "2.1.3.01.03 - Percepciones y Retenciones efectuadas": {}, 
+                        "2.1.3.01.04 - IVA a Pagar": {}
+                    }, 
+                    "2.1.3.02.00 - INGRESOS BRUTOS": {
+                        "2.1.3.02.01 - Impuesto a los Ingresos Brutos a Pagar": {}, 
+                        "2.1.3.02.02 - Percepciones efectuadas Ingresos": {}
+                    }, 
+                    "2.1.3.03.00 - IMPUESTO A LAS GANANCIAS": {
+                        "2.1.3.03.01 - Impuesto Ganancia Mi\u0301nima Presunta a": {}, 
+                        "2.1.3.03.02 - Impuesto a las Ganancias a Pagar": {}, 
+                        "2.1.3.03.03 - Pasivo por Impuesto Diferido": {}, 
+                        "2.1.3.03.04 - Percepciones y Retenciones efectuadas": {}
+                    }
+                }, 
+                "2.1.4.00.00 - DEUDAS FINANCIERAS": {
+                    "2.1.4.01.00 - Pre\u0301stamo Banco de la Nacio\u0301n Argentina (Cte.)": {}, 
+                    "2.1.4.02.00 - Pre\u0301stamo Banco de la Provincia de Bs. As.": {}
+                }, 
+                "2.1.5.00.00 - OTRAS DEUDAS CORRIENTES": {
+                    "2.1.5.01.00 - Dividendos a pagar (Ctes.)": {}, 
+                    "2.1.5.02.00 - Honorarios Directores a Pagar (Ctes.)": {}
+                }, 
+                "2.1.6.00.00 - PROVISIONES": {
+                    "2.1.6.01.00 - Provisio\u0301n para despidos": {}, 
+                    "2.1.6.02.00 - Provisio\u0301n para SAC": {}
+                }, 
+                "2.1.7.00.00 - INVENTARIOS POR PAGAR": {
+                    "2.1.7.01.00 - Inventario entrante no facturado": {
+                        "account_type": "Stock Received But Not Billed"
+                    }
+                }
+            }, 
+            "2.2.0.00.00 - PASIVO NO CORRIENTE": {
+                "2.2.1.00.00 - DEUDAS FINANCIERAS NO CORRIENTES": {
+                    "2.2.1.01.00 - Pre\u0301stamo Banco de la Nacio\u0301n Argentina(ejemplo) (No": {}
+                }, 
+                "2.2.2.00.00 - CARGAS FISCALES NO CORRIENTES": {
+                    "2.2.2.01.00 - Moratoria": {}
+                }, 
+                "2.2.3.00.00 - DEUDAS COMERCIALES": {
+                    "2.2.3.01.00 - ACREEDORES": {
+                        "2.2.3.01.01 - Acreedores Locales (No Ctes.)": {}
+                    }
+                }, 
+                "2.2.4.00.00 - OTRAS DEUDAS NO CORRIENTES": {
+                    "is_group": 1
+                }
+            }, 
+            "root_type": "Liability"
+        }, 
+        "3.0.0.00.00 - PATRIMONIO NETO": {
+            "3.1.0.00.00 - APORTE DE LOS PROPIETARIOS": {
+                "3.1.1.00.00 - CAPITAL SOCIAL": {
+                    "3.1.1.01.00 - Acciones en Circulacio\u0301n": {}, 
+                    "3.1.1.02.00 - Aportes Irrevocables": {}, 
+                    "3.1.1.03.00 - Acciones a distribuir": {}, 
+                    "3.1.1.04.00 - Capital": {}, 
+                    "3.1.1.05.00 - Ajuste del Capital": {}
+                }
+            }, 
+            "3.3.0.00.00 - RESERVAS": {
+                "3.3.1.00.00 - Reserva Legal": {}, 
+                "3.3.2.00.00 - Reserva Facultativa": {}, 
+                "3.3.3.00.00 - Reserva Estatutaria": {}, 
+                "3.3.4.00.00 - Ajuste Reserva Legal": {}
+            }, 
+            "3.4.0.00.00 - RESULTADOS ACUMULADOS": {
+                "3.4.1.00.00 - Resultado del Ejercicio": {}, 
+                "3.4.2.00.00 - Resultado Ejercicios Anteriores": {}, 
+                "3.4.3.00.00 - A.R.E.A (P)": {}, 
+                "3.4.4.00.00 - A.R.E.A (G)": {}
+            }, 
+            "root_type": "Equity"
+        }, 
+        "4.1.0.00.00 - INGRESOS": {
+            "4.1.0.00.00 - INGRESOS ORDINARIOS": {
+                "4.1.1.00.00 - INGRESOS POR SERVICIOS PRESTADOS": {
+                    "4.1.1.01.00 - Ventas de Servicios": {}, 
+                    "4.1.1.02.00 - Ingresos de fuente extranjera": {}
+                }, 
+                "4.1.3.00.00 - RESULTADOS FINANCIEROS Y POR": {
+                    "4.1.3.01.00 - Intereses Ganados": {}, 
+                    "4.1.3.02.00 - Resultado por Tenencia de acciones": {}, 
+                    "4.1.3.03.00 - Diferencia tipo de cambio": {}, 
+                    "4.1.3.04.00 - Resultado por tenencia (positivo)": {}
+                }, 
+                "4.1.4.00.00 - OTROS INGRESOS ORDINARIOS": {
+                    "is_group": 1
+                }
+            }, 
+            "4.2.0.00.00 - INGRESOS EXTRAORDINARIOS": {
+                "4.2.1.00.00 - Utilidad Venta Bienes de Uso": {}, 
+                "4.2.2.00.00 - Reintegro de Seguros": {}, 
+                "4.2.3.00.00 - Otros ingresos extraordinarios": {}
+            }, 
+            "root_type": "Income"
+        }, 
+        "5.0.0.00.00 - EGRESOS": {
+            "5.1.0.00.00 - EGRESOS ORDINARIOS": {
+                "5.1.2.00.00 - GASTOS DE EXPLOTACIO\u0301N": {
+                    "5.1.2.01.00 - Sueldos y Jornales - Explotacio\u0301n": {}, 
+                    "5.1.2.02.00 - Cargas Sociales - Explotacio\u0301n": {}, 
+                    "5.1.2.03.00 - Energi\u0301a - Explotacio\u0301n": {}, 
+                    "5.1.2.04.00 - Honorarios Profesionales - Explotacio\u0301n": {}, 
+                    "5.1.2.05.00 - Ropa de trabajo - Explotacio\u0301n": {}, 
+                    "5.1.2.06.00 - Seguros - Explotacio\u0301n": {}, 
+                    "5.1.2.07.00 - Despidos - Explotacio\u0301n": {}, 
+                    "5.1.2.08.00 - Comida del personal - Explotacio\u0301n": {}, 
+                    "5.1.2.09.00 - Cuota me\u0301dica a cargo del empleador": {}, 
+                    "5.1.2.10.00 - Amortizaciones - Explotacio\u0301n": {}, 
+                    "5.1.2.11.00 - Repuestos y Reparaciones - Explotacio\u0301n": {}, 
+                    "5.1.2.12.00 - Gastos de limpieza - Explotacio\u0301n": {}, 
+                    "5.1.2.13.00 - Mantenimiento - Explotacio\u0301n": {}, 
+                    "5.1.2.14.00 - Combustibles y Lubricantes - Explotacio\u0301n": {}, 
+                    "5.1.2.15.00 - Insumos diversos - Explotacio\u0301n": {}, 
+                    "5.1.2.16.00 - Fletes - Explotacio\u0301n": {}
+                }, 
+                "5.1.3.00.00 - GASTOS DE ADMINISTRACIO\u0301N": {
+                    "5.1.3.01.00 - Sueldos - Administracio\u0301n": {}, 
+                    "5.1.3.02.00 - Cargas Sociales - Administracio\u0301n": {}, 
+                    "5.1.3.03.00 - Honorarios - Administracio\u0301n": {}, 
+                    "5.1.3.04.00 - Amortizaciones - Administracio\u0301n": {}, 
+                    "5.1.3.05.00 - Via\u0301ticos - Administracio\u0301n": {}, 
+                    "5.1.3.06.00 - Libreri\u0301a y Papeleri\u0301a - Administracio\u0301n": {}, 
+                    "5.1.3.07.00 - Certificaciones y Sellados": {}, 
+                    "5.1.3.08.00 - Gastos Bancarios - Administracio\u0301n": {}, 
+                    "5.1.3.09.00 - Gastos Varios - Administracio\u0301n": {}, 
+                    "5.1.3.10.00 - Insumos Computacio\u0301n - Administracio\u0301n": {}, 
+                    "5.1.3.11.00 - Correspondencia - Administracio\u0301n": {}, 
+                    "5.1.3.12.00 - Mantenimiento - Administracio\u0301n": {}, 
+                    "5.1.3.13.00 - Energi\u0301a - Administracio\u0301n": {}, 
+                    "5.1.3.14.00 - Seguros - Administracio\u0301n": {}, 
+                    "5.1.3.15.00 - Costo sobre ventas": {
+                        "account_type": "Cost of Goods Sold"
+                    }, 
+                    "5.1.3.16.00 - Gastos de Valoracion": {
+                        "account_type": "Expenses Included In Valuation"
+                    }
+                }, 
+                "5.1.4.00.00 - GASTOS DE COMERCIALIZACIO\u0301N": {
+                    "5.1.4.01.00 - Sueldos - Comercializacio\u0301n": {}, 
+                    "5.1.4.02.00 - Cargas Sociales - Comercializacio\u0301n": {}, 
+                    "5.1.4.03.00 - Publicidad - Comercializacio\u0301n": {}, 
+                    "5.1.4.04.00 - Amortizaciones - Comercializacio\u0301n": {}, 
+                    "5.1.4.05.00 - Seguros - Comercializacio\u0301n": {}, 
+                    "5.1.4.06.00 - Honorarios - Comercializacio\u0301n": {}, 
+                    "5.1.4.07.00 - Gastos Varios - Comercializacio\u0301n": {}, 
+                    "5.1.4.08.00 - Fletes - Comercializacio\u0301n": {}, 
+                    "5.1.4.09.00 - IVA no computable - Comercializacio\u0301n": {}, 
+                    "5.1.4.10.00 - Descuentos otorgados a clientes": {}, 
+                    "5.1.4.11.00 - Comisiones de terceros": {}, 
+                    "5.1.4.12.00 - Quebrantos por deudores": {}, 
+                    "5.1.4.13.00 - Via\u0301ticos - Comercializacio\u0301n": {}
+                }, 
+                "5.1.5.00.00 - GASTOS FINANCIEROS": {
+                    "5.1.5.01.00 - Intereses y Gastos bancarios": {}, 
+                    "5.1.5.02.00 - Intereses a Proveedores": {}, 
+                    "5.1.5.03.00 - Intereses y recargos impositivos": {}, 
+                    "5.1.5.04.00 - Diferencia de Cambio": {}, 
+                    "5.1.5.05.00 - Diferencia de Cambio Balance en": {}, 
+                    "5.1.5.06.00 - Resultado por tenencia (negativo)": {}, 
+                    "5.1.5.08.00 - Amortizaciones Inversiones en bienes": {}, 
+                    "5.1.5.09.00 - R.E.C.P.A.M": {}, 
+                    "5.1.5.10.00 - Resultado por tenencia negativo de": {}
+                }, 
+                "5.1.7.00.00 - IMPUESTOS": {
+                    "5.1.7.01.00 - Impuesto a las Ganancias": {}, 
+                    "5.1.7.02.00 - Impuesto a las Ganancia Mi\u0301nima": {}, 
+                    "5.1.7.03.00 - Impuesto a los Ingresos Brutos": {}, 
+                    "5.1.7.04.00 - Tasa municipal": {}, 
+                    "5.1.7.05.00 - Impuestos Territoriales": {}, 
+                    "5.1.7.06.00 - Impuesto s/ los De\u0301bitos y Cre\u0301ditos": {}, 
+                    "5.1.7.07.00 - Impuestos internos y varios": {}
+                }, 
+                "5.1.8.00.00 - GASTOS SOBRE EXISTENCIAS": {
+                    "5.1.8.01.00 - Costo sobre ventas": {
+                        "account_type": "Cost of Goods Sold"
+                    }, 
+                    "5.1.8.02.00 - Gastos de Valoracion": {
+                        "account_type": "Expenses Included In Valuation"
+                    }, 
+                    "5.1.8.03.00 - Ajuste de Existencia": {
+                        "account_type": "Stock Adjustment"
+                    }
+                }
+            }, 
+            "5.2.0.00.00 - EGRESOS EXTRAORDINARIOS": {
+                "5.2.1.00.00 - Pe\u0301rdida por venta bienes de uso": {}, 
+                "5.2.2.00.00 - Amortizaciones extraordinarias": {}, 
+                "5.2.3.00.00 - Ajuste del valor de los bienes": {}, 
+                "5.2.4.00.00 - Ajuste de Amortizaciones acumuladas de": {}
+            }, 
+            "root_type": "Expense"
+        }
+    }
+}

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

@@ -1,414 +0,0 @@
-{
-    "country_code": "at",
-    "name": "Austria - Chart of Accounts - Einheitskontenrahmen",
-    "tree": {
-        "Klasse 0 Aktiva: Anlageverm\u00f6gen": {
-				"0100 Konzessionen ": {"account_type": "Fixed Asset"},
-				"0110 Patentrechte und Lizenzen ": {"account_type": "Fixed Asset"},
-				"0120 Datenverarbeitungsprogramme ": {"account_type": "Fixed Asset"},
-				"0130 Marken, Warenzeichen und Musterschutzrechte, sonstige Urheberrechte ": {"account_type": "Fixed Asset"},
-				"0140 Pacht- und Mietrechte ": {"account_type": "Fixed Asset"},
-				"0150 Bezugs- und ähnliche Rechte ": {"account_type": "Fixed Asset"},
-				"0160 Geschäfts-/Firmenwert ": {"account_type": "Fixed Asset"},
-				"0170 Umgründungsmehrwert ": {"account_type": "Fixed Asset"},
-				"0180 Geleistete Anzahlungen auf immaterielle Vermögensgegenstände": {"account_type": "Fixed Asset"},
-				"0190 Kumulierte Abschreibungen zu immateriellen Vermögensgegenständen ": {"account_type": "Fixed Asset"},
-				"0200 Unbebaute Grundstücke, soweit nicht landwirtschaftlich genutzt ": {"account_type": "Fixed Asset"},
-				"0210 Bebaute Grundstücke (Grundwert) ": {"account_type": "Fixed Asset"},
-				"0220 Landwirtschaftlich genutzte Grundstücke ": {"account_type": "Fixed Asset"},
-				"0230 Grundstücksgleiche Rechte ": {"account_type": "Fixed Asset"},
-				"0300 Betriebs- und Geschäftsgebäude auf eigenem Grund ": {"account_type": "Fixed Asset"},
-				"0310 Wohn- und Sozialgebäude auf eigenem Grund ": {"account_type": "Fixed Asset"},
-				"0320 Betriebs- und Geschäftsgebäude auf fremdem Grund ": {"account_type": "Fixed Asset"},
-				"0330 Wohn- und Sozialgebäude auf fremdem Grund ": {"account_type": "Fixed Asset"},
-				"0340 Grundstückseinrichtungen auf eigenem Grund ": {"account_type": "Fixed Asset"},
-				"0350 Grundstückseinrichtungen auf fremdem Grund ": {"account_type": "Fixed Asset"},
-				"0360 Bauliche Investitionen in fremden (gepachteten) Betriebs- und Geschäftsgebäuden": {"account_type": "Fixed Asset"},
-				"0370 Bauliche Investitionen in fremden (gepachteten) Wohn- und Sozialgebäuden": {"account_type": "Fixed Asset"},
-				"0390 Kumulierte Abschreibungen zu Grundstücken ": {"account_type": "Fixed Asset"},
-				"0400 Maschinen und Geräte ": {"account_type": "Fixed Asset"},				
-				"0500 Maschinenwerkzeuge ": {"account_type": "Fixed Asset"},
-				"0510 Allgemeine Werkzeuge und Handwerkzeuge ": {"account_type": "Fixed Asset"},
-				"0520 Prototypen, Formen, Modelle ": {"account_type": "Fixed Asset"},
-				"0530 Andere Erzeugungshilfsmittel (auch Softwarewerkzeuge)": {"account_type": "Fixed Asset"},
-				"0540 Hebezeuge und Montageanlagen ": {"account_type": "Fixed Asset"},
-				"0550 Geringwertige Vermögensgegenstände, soweit im Erzeugungsprozess ": {"account_type": "Fixed Asset"},
-				"0560 Festwerte technische Anlagen und Maschinen ": {"account_type": "Fixed Asset"},
-				"0590 Kumulierte Abschreibungen zu technischen Anlagen und Maschinen ": {"account_type": "Fixed Asset"},
-				"0600 Betriebs- und Geschäftsausstattung, soweit nicht gesondert angeführt ": {"account_type": "Fixed Asset"},
-				"0610 Andere Anlagen, soweit nicht gesondert angeführt ": {"account_type": "Fixed Asset"},
-				"0620 Büromaschinen, EDV-Anlagen ": {"account_type": "Fixed Asset"},
-				"0630 PKW und Kombis ": {"account_type": "Fixed Asset"},
-				"0640 LKW ": {"account_type": "Fixed Asset"},
-				"0650 Andere Beförderungsmittel ": {"account_type": "Fixed Asset"},
-				"0660 Gebinde ": {"account_type": "Fixed Asset"},
-				"0670 Geringwertige Vermögensgegenstände, soweit nicht im Erzeugungssprozess verwendet": {"account_type": "Fixed Asset"},
-				"0680 Festwerte außer technische Anlagen und Maschinen ": {"account_type": "Fixed Asset"},
-				"0690 Kumulierte Abschreibungen zu anderen Anlagen, Betriebs- und Geschäftsausstattung": {"account_type": "Fixed Asset"},
-				"0700 Geleistete Anzahlungen auf Sachanlagen ": {"account_type": "Fixed Asset"},
-				"0710 Anlagen in Bau ": {"account_type": "Fixed Asset"},
-				"0790 Kumulierte Abschreibungen zu geleisteten Anzahlungen auf Sachanlagen ": {"account_type": "Fixed Asset"},
-				"0800 Anteile an verbundenen Unternehmen ": {"account_type": "Fixed Asset"},
-				"0810 Beteiligungen an Gemeinschaftsunternehmen ": {"account_type": "Fixed Asset"},
-				"0820 Beteiligungen an angeschlossenen (assoziierten) Unternehmen ": {"account_type": "Fixed Asset"},
-				"0830 Eigene Anteile, Anteile an herrschenden oder mit Mehrheit beteiligten ": {"account_type": "Fixed Asset"},
-				"0840 Sonstige Beteiligungen ": {"account_type": "Fixed Asset"},
-				"0850 Ausleihungen an verbundene Unternehmen ": {"account_type": "Fixed Asset"},
-				"0860 Ausleihungen an Unternehmen mit Beteiligungsverhältnis": {"account_type": "Fixed Asset"},
-				"0870 Ausleihungen an Gesellschafter ": {"account_type": "Fixed Asset"},
-				"0880 Sonstige Ausleihungen ": {"account_type": "Fixed Asset"},
-				"0890 Anteile an Kapitalgesellschaften ohne Beteiligungscharakter ": {"account_type": "Fixed Asset"},
-				"0900 Anteile an Personengesellschaften ohne Beteiligungscharakter ": {"account_type": "Fixed Asset"},
-				"0910 Genossenschaftsanteile ohne Beteiligungscharakter ": {"account_type": "Fixed Asset"},
-				"0920 Anteile an Investmentfonds ": {"account_type": "Fixed Asset"},
-				"0930 Festverzinsliche Wertpapiere des Anlagevermögens ": {"account_type": "Fixed Asset"},
-				"0980 Geleistete Anzahlungen auf Finanzanlagen ": {"account_type": "Fixed Asset"},
-				"0990 Kumulierte Abschreibungen zu Finanzanlagen ": {"account_type": "Fixed Asset"},
-            "root_type": "Asset"
-        },    
-        "Klasse 1 Aktiva: Vorr\u00e4te": {
-            "1000 Bezugsverrechnung": {"account_type": "Stock"},
-            "1100 Rohstoffe": {"account_type": "Stock"},
-            "1200 Bezogene Teile": {"account_type": "Stock"},
-            "1300 Hilfsstoffe": {"account_type": "Stock"},
-            "1350 Betriebsstoffe": {"account_type": "Stock"},
-            "1360 Vorrat Energietraeger": {"account_type": "Stock"},            
-            "1400 Unfertige Erzeugnisse": {"account_type": "Stock"},
-            "1500 Fertige Erzeugnisse": {"account_type": "Stock"},
-            "1600 Handelswarenvorrat": {"account_type": "Stock Received But Not Billed"},
-            "1700 Noch nicht abrechenbare Leistungen": {"account_type": "Stock"},
-            "1900 Wertberichtigungen": {"account_type": "Stock"},
-            "1800 Geleistete Anzahlungen": {"account_type": "Stock"},
-            "root_type": "Asset"
-        },    
-        "Klasse 3 Passiva: Verbindlichkeiten": {
-            "3020 Steuerr\u00fcckstellungen": {"account_type": "Tax"},
-            "3040 Sonstige R\u00fcckstellungen": {"account_type": "Payable"},
-            "3110 Verbindlichkeiten gegen\u00fcber Bank": {"account_type": "Payable"},
-            "3150 Verbindlichkeiten Darlehen": {"account_type": "Payable"},
-            "3185 Verbindlichkeiten Kreditkarte": {"account_type": "Payable"},            
-            "3380 Verbindlichkeiten aus der Annahme gezogener Wechsel u. d. Ausstellungen eigener Wechsel": {
-                "account_type": "Payable"
-            },
-            "3400 Verbindlichkeiten gegen\u00fc. verb. Untern., Verbindl. gegen\u00fc. Untern., mit denen eine Beteiligungsverh\u00e4lnis besteht": {},
-            "3460 Verbindlichkeiten gegenueber Gesellschaftern": {"account_type": "Payable"},
-            "3470 Einlagen stiller Gesellschafter": {"account_type": "Payable"},
-            "3590 Verbindlichkeiten Kommunalabgaben": {"account_type": "Tax"},                        
-            "3600 Verbindlichkeiten Sozialversicherung": {"account_type": "Payable"},
-            "3000 Allgemeine Verbindlichkeiten (Schuld)": {"account_type": "Payable"},
-            "3700 Sonstige Verbindlichkeiten": {"account_type": "Payable"},
-            "3900 Passive Rechnungsabgrenzungsposten": {"account_type": "Payable"},
-            "3100 Anleihen (einschlie\u00dflich konvertibler)": {"account_type": "Payable"},
-            "3200 Erhaltene Anzahlungen auf Bestellungen": {"account_type": "Payable"},
-            "3040 R\u00fcckstellungen f\u00fcr Abfertigung": {"account_type": "Payable"},
-            "3010 R\u00fcckstellungen f\u00fcr Pensionen": {"account_type": "Payable"},
-            "3530 USt. \u00a719 (reverse charge)": {
-                "account_type": "Tax"
-            },
-            "3500 Verbindlichkeiten aus Umsatzsteuer": {"account_type": "Tax"},
-            "3580 Umsatzsteuer Zahllast": {
-                "account_type": "Tax"
-            },
-            "3510 Umsatzsteuer aus i.g. Erwerb 10%": {
-                "account_type": "Tax"
-            },
-            "3520 Umsatzsteuer aus i.g. Erwerb 20%": {
-                "account_type": "Tax"
-            },
-            "3560 Umsatzsteuer-Evidenzkonto f\u00fcr erhaltene Anzahlungen auf Bestellungen": {},
-            "3360 Verbindlichkeiten aus Lieferungen u. Leistungen EU": {
-                "account_type": "Payable"
-            },
-            "3000 Verbindlichkeiten aus Lieferungen u. Leistungen Inland": {
-                "account_type": "Payable"
-            },
-            "3370 Verbindlichkeiten aus Lieferungen u. Leistungen sonst. Ausland": {
-                "account_type": "Payable"
-            },
-            "3400 Verbindlichkeiten gegen\u00fcber verbundenen Unternehmen": {},
-            "3570 Verrechnung Finanzamt": {
-                "account_type": "Tax"
-            },
-            "root_type": "Liability"
-        },      
-        "Klasse 2 Aktiva: Umlaufverm\u00f6gen, Rechnungsabgrenzungen": {
-            "2030 Forderungen aus Lieferungen und Leistungen Inland (0% USt, umsatzsteuerfrei)": {
-                "account_type": "Receivable"
-            },
-            "2010 Forderungen aus Lieferungen und Leistungen Inland (10% USt, umsatzsteuerfrei)": {
-                "account_type": "Receivable"
-            },
-            "2000 Forderungen aus Lieferungen und Leistungen Inland (20% USt, umsatzsteuerfrei)": {
-                "account_type": "Receivable"
-            },
-            "2040 Forderungen aus Lieferungen und Leistungen Inland (sonstiger USt-Satz)": {
-                "account_type": "Receivable"
-            },                                    
-            "2100 Forderungen aus Lieferungen und Leistungen EU": {
-                "account_type": "Receivable"
-            },
-            "2150 Forderungen aus Lieferungen und Leistungen Ausland (Nicht-EU)": {
-                "account_type": "Receivable"
-            },
-            "2200 Forderungen gegen\u00fcber verbundenen Unternehmen": {
-                "account_type": "Receivable"
-            },
-            "2250 Forderungen gegen\u00fcber Unternehmen, mit denen ein Beteiligungsverh\u00e4ltnis besteht": {
-                "account_type": "Receivable"
-            },
-            "2300 Sonstige Forderungen und Verm\u00f6gensgegenst\u00e4nde": {
-                "account_type": "Receivable"
-            },
-            "2630 Sonstige Wertpapiere": {
-                "account_type": "Stock"
-            },
-            "2750 Kassenbest\u00e4nde in Fremdw\u00e4hrung": {
-                "account_type": "Cash"
-            },
-            "2900 Aktive Rechnungsabrenzungsposten": {
-                "account_type": "Receivable"
-            },
-            "2600 Anteile an verbundenen Unternehmen": {
-                "account_type": "Equity"
-            },
-            "2680 Besitzwechsel ohne Forderungen": {
-                "account_type": "Receivable"
-            },
-            "2950 Aktiviertes Disagio": {
-                "account_type": "Receivable"
-            },
-            "2610 Eigene Anteile und Wertpapiere an mit Mehrheit beteiligten Unternehmen": {
-                "account_type": "Receivable"
-            },
-            "2570 Einfuhrumsatzsteuer (bezahlt)": {"account_type": "Tax"},
-            
-            "2460 Eingeforderte aber noch nicht eingezahlte Einlagen": {
-                "account_type": "Receivable"
-            },
-            "2180 Einzelwertberichtigungen zu Forderungen aus Lief. und Leist. Ausland": {
-                "account_type": "Receivable"
-            },
-            "2130 Einzelwertberichtigungen zu Forderungen aus Lief. und Leist. EU": {
-                "account_type": "Receivable"
-            },
-            "2080 Einzelwertberichtigungen zu Forderungen aus Lief. und Leist. Inland ": {
-                "account_type": "Receivable"
-            },
-            "2270 Einzelwertberichtigungen zu Forderungen gegen\u00fcber Unternehmen mit denen ein Beteiligungsverh\u00e4ltnis besteht": {
-                "account_type": "Receivable"
-            },
-            "2230 Einzelwertberichtigungen zu Forderungen gegen\u00fcber verbundenen Unternehmen": {
-                "account_type": "Receivable"
-            },
-            "2470 Einzelwertberichtigungen zu sonstigen Forderungen und Verm\u00f6gensgegenst\u00e4nden": {
-                "account_type": "Receivable"
-            },
-            "2700 Kassenbestand": {
-                "account_type": "Cash"
-            },
-            "2190 Pauschalwertberichtigungen zu Forderungen aus Lief. und Leist. sonstiges Ausland": {
-                "account_type": "Receivable"
-            },
-            "2130 Pauschalwertberichtigungen zu Forderungen aus Lief. und Leist. EU": {
-                "account_type": "Receivable"
-            },
-            "2100 Pauschalwertberichtigungen zu Forderungen aus Lief. und Leist. Inland ": {
-                "account_type": "Receivable"
-            },
-            "2280 Pauschalwertberichtigungen zu Forderungen gegen\u00fcber Unternehmen mit denen ein Beteiligungsverh\u00e4ltnis besteht": {
-                "account_type": "Receivable"
-            },
-            "2240 Pauschalwertberichtigungen zu Forderungen gegen\u00fcber verbundenen Unternehmen": {
-                "account_type": "Receivable"
-            },
-            "2480 Pauschalwertberichtigungen zu sonstigen Forderungen und Verm\u00f6gensgegenst\u00e4nden": {
-                "account_type": "Receivable"
-            },
-            "2740 Postwertzeichen": {
-                "account_type": "Cash"
-            },
-            "2780 Schecks in Euro": {
-                "account_type": "Cash"
-            },
-            "2800 Guthaben bei Kreditinstitut": {
-                "account_type": "Bank"
-            },            
-            "2810 Guthaben bei Paypal": {
-                "account_type": "Bank"
-            },
-            "2930 Mietvorauszahlungen": {
-                "account_type": "Receivable"
-            },
-            "2980 Abgrenzung latenter Steuern": {
-                "account_type": "Receivable"
-            },
-            "2500 Vorsteuer": {
-                "account_type": "Receivable"
-            },
-            "2510 Vorsteuer aus innergemeinschaftlichem Erwerb 10%": {
-                "account_type": "Tax"
-            },
-            "2520 Vorsteuer aus innergemeinschaftlichem Erwerb 20%": {
-                "account_type": "Tax"
-            },
-            "2530 Vorsteuer \u00a719/Art 19 ( reverse charge ) ": {
-                "account_type": "Tax"
-            },
-            "2690 Wertberichtigungen zu Wertpapieren und Anteilen": {
-                "account_type": "Receivable"
-            },
-            "root_type": "Asset"
-        },
-          "Klasse 4: Betriebliche Erträge": {
-            "4000 Erlöse 20 %": {"account_type": "Income Account"},          
-            "4020 Erl\u00f6se 0 % steuerbefreit": {"account_type": "Income Account"},            
-            "4010 Erl\u00f6se 10 %": {"account_type": "Income Account"},
-            "4030 Erl\u00f6se 13 %": {"account_type": "Income Account"},            
-            "4040 Erl\u00f6se 0 % innergemeinschaftliche Lieferungen": {"account_type": "Income Account"},      
-            "4400 Erl\u00f6sreduktion 0 % steuerbefreit": {"account_type": "Expense Account"},            
-            "4410 Erl\u00f6sreduktion 10 %": {"account_type": "Expense Account"},
-            "4420 Erl\u00f6sreduktion 20 %": {"account_type": "Expense Account"},
-            "4430 Erl\u00f6sreduktion 13 %": {"account_type": "Expense Account"},            
-            "4440 Erl\u00f6sreduktion 0 % innergemeinschaftliche Lieferungen": {"account_type": "Expense Account"}, 
-            "4500 Ver\u00e4nderungen des Bestandes an fertigen und unfertigen Erzeugn. sowie an noch nicht abrechenbaren Leistungen": {"account_type": "Income Account"},
-            "4580 Aktivierte Eigenleistungen": {"account_type": "Income Account"},
-            "4600 Erl\u00f6se aus dem Abgang vom Anlageverm\u00f6gen, ausgen. Finanzanlagen": {"account_type": "Income Account"},
-            "4630 Ertr\u00e4ge aus dem Abgang vom Anlageverm\u00f6gen, ausgen. Finanzanlagen": {"account_type": "Income Account"},
-            "4660 Ertr\u00e4ge aus der Zuschreibung zum Anlageverm\u00f6gen, ausgen. Finanzanlagen": {"account_type": "Income Account"},
-            "4700 Ertr\u00e4ge aus der Aufl\u00f6sung von R\u00fcckstellungen": {"account_type": "Income Account"},
-            "4800 \u00dcbrige betriebliche Ertr\u00e4ge": {"account_type": "Income Account"},
-            "root_type": "Income"
-        },        
-        "Klasse 5: Aufwand f\u00fcr Material und Leistungen": {
-            "5000 Einkauf Partnerleistungen": {"account_type": "Cost of Goods Sold"},        
-            "5100 Verbrauch an Rohstoffen": {"account_type": "Cost of Goods Sold"},
-            "5200 Verbrauch von bezogenen Fertig- und Einzelteilen": {"account_type": "Cost of Goods Sold"},
-            "5300 Verbrauch von Hilfsstoffen": {"account_type": "Cost of Goods Sold"},
-            "5340 Verbrauch Verpackungsmaterial": {"account_type": "Cost of Goods Sold"},
-            "5470 Verbrauch von Kleinmaterial": {"account_type": "Cost of Goods Sold"},
-            "5450 Verbrauch von Reinigungsmaterial": {"account_type": "Cost of Goods Sold"},                                  
-            "5400 Verbrauch von Betriebsstoffen": {"account_type": "Cost of Goods Sold"},
-            "5500 Verbrauch von Werkzeugen und anderen Erzeugungshilfsmittel": {"account_type": "Cost of Goods Sold"},
-            "5600 Verbrauch von Brenn- und Treibstoffen, Energie und Wasser": {"account_type": "Cost of Goods Sold"},
-            "5700 Bearbeitung durch Dritte": {"account_type": "Cost of Goods Sold"},
-            "5900 Aufwandsstellenrechnung Material": {"account_type": "Cost of Goods Sold"},
-            "5820 Skontoertr\u00e4ge (20% USt.)": {"account_type": "Income Account"},
-            "5810 Skontoertr\u00e4ge (10% USt.)": {"account_type": "Income Account"},
-            "5010 Handelswareneinkauf 10 %": {"account_type": "Cost of Goods Sold"},
-            "5020 Handelswareneinkauf 20 %": {"account_type": "Cost of Goods Sold"},
-            "5040 Handelswareneinkauf innergemeinschaftlicher Erwerb 10 % VSt/10 % USt": {"account_type": "Cost of Goods Sold"},
-            "5050 Handelswareneinkauf innergemeinschaftlicher Erwerb 20 % VSt/20 % USt": {"account_type": "Cost of Goods Sold"},
-            "5070 Handelswareneinkauf innergemeinschaftlicher Erwerb ohne Vorsteuerabzug und 10 % USt": {"account_type": "Cost of Goods Sold"},
-            "5080 Handelswareneinkauf innergemeinschaftlicher Erwerb ohne Vorsteuerabzug und 20 % USt": {"account_type": "Cost of Goods Sold"},
-            "root_type": "Expense"
-        },
-        "Klasse 6: Personalaufwand": {
-            "6000 L\u00f6hne": {"account_type": "Payable"},
-            "6200 Geh\u00e4lter": {"account_type": "Payable"},
-            "6400 Aufwendungen f\u00fcr Abfertigungen": {"account_type": "Payable"},
-            "6450 Aufwendungen f\u00fcr Altersversorgung": {"account_type": "Payable"},
-            "6500 Gesetzlicher Sozialaufwand Arbeiter": {"account_type": "Payable"},
-            "6560 Gesetzlicher Sozialaufwand Angestellte": {"account_type": "Payable"},
-            "6600 Lohnabh\u00e4ngige Abgaben und Pflichtbeitr\u00e4gte": {"account_type": "Payable"},
-            "6660 Gehaltsabh\u00e4ngige Abgaben und Pflichtbeitr\u00e4gte": {"account_type": "Payable"},
-            "6700 Sonstige Sozialaufwendungen": {"account_type": "Payable"},
-            "6900 Aufwandsstellenrechnung Personal": {"account_type": "Payable"},
-            "root_type": "Expense"
-        },       
-         "Klasse 7: Abschreibungen und sonstige betriebliche Aufwendungen": {
-            "7010 Abschreibungen auf das Anlageverm\u00f6gen (ausgenommen Finanzanlagen)": {"account_type": "Depreciation"},
-            "7100 Sonstige Steuern und Geb\u00fchren": {"account_type": "Tax"},
-            "7200 Instandhaltung u. Reinigung durch Dritte, Entsorgung, Energie": {"account_type": "Expense Account"},
-            "7300 Transporte durch Dritte": {"account_type": "Expense Account"},
-            "7310 Fahrrad - Aufwand": {"account_type": "Expense Account"},
-            "7320 Kfz - Aufwand": {"account_type": "Expense Account"},
-            "7330 LKW - Aufwand": {"account_type": "Expense Account"},
-            "7340 Lastenrad - Aufwand": {"account_type": "Expense Account"},            
-            "7350 Reise- und Fahraufwand": {"account_type": "Expense Account"},
-            "7360 Tag- und N\u00e4chtigungsgelder": {"account_type": "Expense Account"},
-            "7380 Nachrichtenaufwand": {"account_type": "Expense Account"},
-            "7400 Miet- und Pachtaufwand": {"account_type": "Expense Account"},
-            "7440 Leasingaufwand": {"account_type": "Expense Account"},
-            "7480 Lizenzaufwand": {"account_type": "Expense Account"},
-            "7500 Aufwand f\u00fcr beigestelltes Personal": {"account_type": "Expense Account"},
-            "7540 Provisionen an Dritte": {"account_type": "Expense Account"},
-            "7580 Aufsichtsratsverg\u00fctungen": {"account_type": "Expense Account"},
-            "7610 Druckerzeugnisse und Vervielf\u00e4ltigungen": {"account_type": "Expense Account"},
-            "7650 Werbung und Repr\u00e4sentationen": {"account_type": "Expense Account"},
-            "7700 Versicherungen": {"account_type": "Expense Account"},
-            "7750 Beratungs- und Pr\u00fcfungsaufwand": {"account_type": "Expense Account"},
-            "7800 Forderungsverluste und Schadensf\u00e4lle": {"account_type": "Expense Account"},
-            "7840 Verschiedene betriebliche Aufwendungen": {"account_type": "Expense Account"},
-            "7910 Aufwandsstellenrechung der Hersteller": {"account_type": "Expense Account"},
-            "7060 Sofortabschreibungen geringwertig": {"account_type": "Expense Account"},
-            "7070 Abschreibungen vom Umlaufverm\u00f6gen, soweit diese die im Unternehmen \u00fcblichen Abschreibungen \u00fcbersteigen": {"account_type": "Depreciation"},
-            "7900 Aufwandsstellenrechnung": {"account_type": "Expense Account"},
-            "7770 Aus- und Fortbildung": {"account_type": "Expense Account"},
-            "7820 Buchwert abgegangener Anlagen, ausgenommen Finanzanlagen": {"account_type": "Expense Account"},
-            "7600 B\u00fcromaterial und Drucksorten": {"account_type": "Expense Account"},
-            "7630 Fachliteratur und Zeitungen ": {"account_type": "Expense Account"},
-            "7960 Herstellungskosten der zur Erzielung der Umsatzerl\u00f6se erbrachten Leistungen": {"account_type": "Expense Account"},
-            "7780 Mitgliedsbeitr\u00e4ge": {"account_type": "Expense Account"},
-            "7880 Skontoertr\u00e4ge auf sonstige betriebliche Aufwendungen": {"account_type": "Expense Account"},
-            "7990 Sonstige betrieblichen Aufwendungen": {"account_type": "Expense Account"},
-            "7680 Spenden und Trinkgelder": {"account_type": "Expense Account"},
-            "7790 Spesen des Geldverkehrs": {"account_type": "Expense Account"},
-            "7830 Verluste aus dem Abgang vom Anlageverm\u00f6gen, ausgenommen Finanzanlagen": {"account_type": "Expense Account"},
-            "7970 Vertriebskosten": {"account_type": "Expense Account"},
-            "7980 Verwaltungskosten": {"account_type": "Expense Account"},
-            "root_type": "Expense"
-        },
-         "Klasse 8: Finanz- und ausserordentliche Ertr\u00e4ge und Aufwendungen": {
-            "8000 Ertr\u00e4ge aus Beteiligungen": {"account_type": "Income Account"},
-            "8050 Ertr\u00e4ge aus anderen Wertpapieren und Ausleihungen des Finanzanlageverm\u00f6gens": {"account_type": "Income Account"},
-            "8100 Zinsen aus Bankguthaben": {"account_type": "Income Account"},
-            "8110 Zinsen aus gewaehrten Darlehen": {"account_type": "Income Account"},
-            "8130 Verzugszinsenertraege": {"account_type": "Income Account"},
-            "8220 Aufwendungen aus Beteiligungen": {"account_type": "Expense Account"},
-            "8260 Aufwendungen aus sonst. Fiananzanlagen und aus Wertpapieren des Umlaufverm\u00f6gens": {},
-            "8280 Zinsen und \u00e4hnliche Aufwendungem": {"account_type": "Expense Account"},
-            "8400 Au\u00dferordentliche Ertr\u00e4ge": {"account_type": "Income Account"},
-            "8450 Au\u00dferordentliche Aufwendungen": {"account_type": "Expense Account"},
-            "8500 Steuern vom Einkommen und vom Ertrag": {
-                "account_type": "Tax"
-            },
-            "8600 Aufl\u00f6sung unversteuerten R\u00fccklagen": {"account_type": "Income Account"},
-            "8700 Aufl\u00f6sung von Kapitalr\u00fccklagen": {"account_type": "Income Account"},
-            "8750 Aufl\u00f6sung von Gewinnr\u00fccklagen": {"account_type": "Income Account"},
-            "8800 Zuweisung zu unversteuerten R\u00fccklagen": {"account_type": "Expense Account"},
-            "8900 Zuweisung zu Gewinnr\u00fccklagen": {"account_type": "Expense Account"},
-            "8100 Buchwert abgegangener Beteiligungen": {"account_type": "Expense Account"},
-            "8130 Buchwert abgegangener Wertpapiere des Umlaufverm\u00f6gens": {"account_type": "Expense Account"},
-            "8120 Buchwert abgegangener sonstiger Finanzanlagen": {"account_type": "Expense Account"},
-            "8990 Gewinnabfuhr bzw. Verlust\u00fcberrechnung aus Ergebnisabf\u00fchrungsvertr\u00e4gen": {"account_type": "Expense Account"},
-            "8350 nicht ausgenutzte Lieferantenskonti": {"account_type": "Expense Account"},
-            "root_type": "Income"
-        },       
-        "Klasse 9 Passiva: Eigenkapital, R\u00fccklagen, stille Einlagen, Abschlusskonten": {
-            "9000 Gezeichnetes bzw. gewidmetes Kapital": {
-                "account_type": "Equity"
-            },
-            "9200 Kapitalr\u00fccklagen": {
-                "account_type": "Equity"
-            },
-            "9300 Gewinnr\u00fccklagen": {
-                "account_type": "Equity"
-            },
-            "9400 Bewertungsreserven uns sonst. unversteuerte R\u00fccklagen": {
-                "account_type": "Equity"
-            },
-            "9600 Private Entnahmen": {"account_type": "Equity"},
-            "9610 Privatsteuern": {"account_type": "Equity"},
-            "9700 Einlagen stiller Gesellschafter ": {"account_type": "Equity"},
-            "9900 Evidenzkonto": {"account_type": "Equity"},
-            "9800 Er\u00f6ffnungsbilanzkonto (EBK)": {"account_type": "Equity"},
-            "9880 Jahresergebnis laut Gewinn- und Verlustrechnung (G+V)": {"account_type": "Equity"},
-            "9850 Schlussbilanzkonto (SBK)": {"account_type": "Round Off"},
-            "9190 nicht eingeforderte ausstehende Einlagen und berechtigte Entnahmen von Gesellschaftern": {
-                "account_type": "Equity"
-            },
-            "root_type": "Equity"
-        }
-     }   
-  }
-

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

@@ -0,0 +1,412 @@
+{
+    "country_code": "ca", 
+    "name": "Canada - Plan comptable pour les provinces francophones", 
+    "tree": {
+        "Actif": {
+            "Actif \u00e0 court terme": {
+                "Avances": {
+                    "Avances aux actionnaires": {}, 
+                    "Avances aux employ\u00e9s": {}, 
+                    "Avances sur commissions": {}
+                }, 
+                "Banque": {
+                    "account_type": "Bank", 
+                    "is_group": 1
+                }, 
+                "Comptes \u00e0 recevoir": {
+                    "Comptes clients": {
+                        "account_type": "Receivable"
+                    }, 
+                    "Provision pour cr\u00e9ances douteuses": {}
+                }, 
+                "Encaisse": {
+                    "is_group": 1
+                }, 
+                "Frais pay\u00e9s d\u2019avance": {
+                    "Assurances pay\u00e9s d'avance": {}, 
+                    "Publicit\u00e9 pay\u00e9 d'avance": {}, 
+                    "Taxes pay\u00e9s d'avance": {}
+                }, 
+                "Petite caisse": {
+                    "account_type": "Cash", 
+                    "is_group": 1
+                }, 
+                "Stocks": {
+                    "Mati\u00e8res premi\u00e8res": {}, 
+                    "Stock de produits fini": {}, 
+                    "Stock exp\u00e9di\u00e9 non-factur\u00e9": {}, 
+                    "Travaux en cours": {}, 
+                    "account_type": "Stock"
+                }, 
+                "Subventions \u00e0 recevoir": {}, 
+                "TR\u00c9SORERIE OU \u00c9QUIVALENTS DE TR\u00c9SORERIE": {}, 
+                "Taxes \u00e0 recevoir": {
+                    "TPS \u00e0 recevoir": {}, 
+                    "TVH \u00e0 recevoir": {
+                        "TVH \u00e0 recevoir - 13%": {}, 
+                        "TVH \u00e0 recevoir - 14%": {}, 
+                        "TVH \u00e0 recevoir - 15%": {}
+                    }, 
+                    "TVP/TVQ \u00e0 recevoir": {}
+                }
+            }, 
+            "Autres actifs": {
+                " Frais de premier \u00e9tablissement": {}, 
+                "Achalandage": {}, 
+                "Brevets, droits": {}, 
+                "Frais de recherche et de d\u00e9veloppement - actif": {}
+            }, 
+            "Immobilisations": {
+                " Amortissement accumul\u00e9 - b\u00e2timent": {}, 
+                " Amortissement accumul\u00e9 - entrep\u00f4t": {}, 
+                " Amortissement accumul\u00e9 - logiciels": {}, 
+                " Amortissement accumul\u00e9 - machinerie et \u00e9quipement": {}, 
+                " Amortissement accumul\u00e9 - \u00e9quipement informatique": {}, 
+                "Amortissement accumul\u00e9 - am\u00e9liorations locatives": {}, 
+                "Amortissement accumul\u00e9 - biens lou\u00e9s en vertu d\u2019un contrat de location - acquisition": {}, 
+                "Amortissement accumul\u00e9 - mat\u00e9riel roulant": {}, 
+                "Amortissement accumul\u00e9 - mobilier et \u00e9quipement de bureau": {}, 
+                "Am\u00e9liorations locatives": {
+                    "account_type": "Fixed Asset"
+                }, 
+                "Biens lou\u00e9s en vertu d\u2019un contrat de location - acquisition": {
+                    "account_type": "Fixed Asset"
+                }, 
+                "B\u00e2timent": {
+                    "account_type": "Fixed Asset"
+                }, 
+                "Entrep\u00f4t": {
+                    "account_type": "Fixed Asset"
+                }, 
+                "Logiciels": {
+                    "account_type": "Fixed Asset"
+                }, 
+                "Machinerie et \u00e9quipement": {
+                    "account_type": "Fixed Asset"
+                }, 
+                "Mat\u00e9riel roulant": {
+                    "account_type": "Fixed Asset"
+                }, 
+                "Mobilier et \u00e9quipement de bureau": {
+                    "account_type": "Fixed Asset"
+                }, 
+                "Terrain": {
+                    "account_type": "Fixed Asset"
+                }, 
+                "account_type": "Fixed Asset", 
+                "\u00c9quipement informatique": {
+                    "account_type": "Fixed Asset"
+                }
+            }, 
+            "Placements": {
+                "D\u00e9p\u00f4ts": {}, 
+                "Placement": {}
+            }, 
+            "root_type": "Asset"
+        }, 
+        "Avoir des actionnaires": {
+            " B\u00e9n\u00e9fice de la p\u00e9riode": {}, 
+            "Bonis": {}, 
+            "B\u00e9n\u00e9fices non r\u00e9partis": {}, 
+            "Capital - actions ordinaire": {}, 
+            "Capital - actions privil\u00e9gi\u00e9": {}, 
+            "Dividendes": {}, 
+            "Surplus d\u2019apport": {}, 
+            "root_type": "Equity"
+        }, 
+        "Charges": {
+            "Charges d'exploitation": {
+                "Salaires et charges sociales": {
+                    "Assurance - emploi": {
+                        "account_type": "Chargeable"
+                    }, 
+                    "Assurance parentale": {}, 
+                    "Fonds des services de sant\u00e9": {}, 
+                    "Imp\u00f4t f\u00e9d\u00e9ral": {}, 
+                    "Imp\u00f4t provincial": {}, 
+                    "Normes du travail": {}, 
+                    "Rentes": {}, 
+                    "Salaires": {
+                        "account_type": "Chargeable"
+                    }, 
+                    "sant\u00e9 et s\u00e9curit\u00e9 du travail CSST": {
+                        "account_type": "Chargeable"
+                    }
+                }
+            }, 
+            "Frais fixes": {
+                "Frais de fabrication": {
+                    " R\u00e9parations et entretien - moules et matrices": {}, 
+                    "Ammortissements": {
+                        "Amortissements - am\u00e9liorations locatives": {
+                            "account_type": "Depreciation"
+                        }, 
+                        "Amortissements - biens lou\u00e9s contrat de location - acquisition": {
+                            "account_type": "Depreciation"
+                        }, 
+                        "Amortissements - b\u00e2timent": {
+                            "account_type": "Depreciation"
+                        }, 
+                        "Amortissements - entrep\u00f4t": {
+                            "account_type": "Depreciation"
+                        }, 
+                        "Amortissements - machinerie et \u00e9quipement": {
+                            "account_type": "Depreciation"
+                        }, 
+                        "Amortissements - mat\u00e9riel roulant": {
+                            "account_type": "Depreciation"
+                        }, 
+                        "Amortissements - moules et matrices": {
+                            "account_type": "Depreciation"
+                        }, 
+                        "account_type": "Depreciation"
+                    }, 
+                    "Assurances": {
+                        " Assurances - feu": {}, 
+                        " Assurances - responsabilit\u00e9": {}, 
+                        " Assurances - vol": {}
+                    }, 
+                    "Avantages sociaux - frais de fabrication": {}, 
+                    "D\u00e9penses - mat\u00e9riel roulant": {}, 
+                    "Entretien du terrain \u00e0 contrat": {}, 
+                    "Fournitures d\u2019emballage": {}, 
+                    "Fournitures d\u2019usine": {}, 
+                    "Location de machinerie": {}, 
+                    "Loyer - b\u00e2timent": {}, 
+                    "Loyer - entrep\u00f4t": {}, 
+                    "Op\u00e9rations indirectes de la main-d\u2019\u0153uvre directe": {
+                        "is_group": 1
+                    }, 
+                    "R\u00e9parations et entretien - b\u00e2timent": {}, 
+                    "R\u00e9parations et entretien - machinerie et \u00e9quipement": {}, 
+                    "Salaires de soutien": {}, 
+                    "Salaires de supervision": {}, 
+                    "Taxes fonci\u00e8res": {}, 
+                    "\u00c9nergie": {}
+                }, 
+                "Frais de formation": {
+                    " Salaires - administration - frais fixe formation": {}, 
+                    "Avantages sociaux - frais fixe formation": {}, 
+                    "Cr\u00e9dits d\u2019imp\u00f4ts \u00e0 la formation": {}, 
+                    "Honoraires": {}, 
+                    "Main-d\u2019\u0153uvre directe - frais fixe formation": {}, 
+                    "Main-d\u2019\u0153uvre indirecte - frais fixe formation": {}, 
+                    "Salaires - bureau - frais fixe formation": {}, 
+                    "Salaires - vente": {}
+                }, 
+                "Frais de non-qualit\u00e9": {
+                    " Avantages sociaux - non-qualit\u00e9": {}, 
+                    " Main-d\u2019\u0153uvre directe - non-qualit\u00e9": {
+                        "Main-d\u2019\u0153uvre directe - gaspillage": {}, 
+                        "Main-d\u2019\u0153uvre directe - r\u00e9parations de garantie": {}, 
+                        "Main-d\u2019\u0153uvre directe - travail a reprendre": {}
+                    }, 
+                    "Mat\u00e9riel - non-qualit\u00e9": {
+                        "Mat\u00e9riel - gaspillage": {}, 
+                        "Mat\u00e9riel - r\u00e9parations de garantie": {}, 
+                        "Mat\u00e9riel - travail a reprendre": {}
+                    }, 
+                    "Salaire - inspecteur (contr\u00f4le de la qualit\u00e9)": {}
+                }, 
+                "Frais de recherche et de d\u00e9veloppement - charge": {
+                    " Mati\u00e8res premi\u00e8res - R&D": {}, 
+                    "Avantages sociaux - R&D": {}, 
+                    "Cr\u00e9dits d\u2019imp\u00f4ts - R&D": {}, 
+                    "Honoraires professionnels - R&D": {}, 
+                    "Main-d\u2019\u0153uvre directe - R&D": {}, 
+                    "Sous-traitance - R&D": {}
+                }, 
+                "Frais financiers": {
+                    " Escomptes de caisse sur achats": {}, 
+                    " Int\u00e9r\u00eats et frais de banque": {}, 
+                    " Int\u00e9r\u00eats sur emprunts - actionnaires": {}, 
+                    " Int\u00e9r\u00eats sur emprunts - machinerie": {}, 
+                    " Int\u00e9r\u00eats sur emprunts - mat\u00e9riel roulant": {}, 
+                    "Escomptes de caisse sur ventes": {}, 
+                    "Int\u00e9r\u00eats sur hypoth\u00e8que": {}
+                }, 
+                "Frais fixe de vente": {
+                    " Frais de voyages - camionneurs": {}, 
+                    " Frais de voyages - service apr\u00e8s-vente": {}, 
+                    "Amortissement - camions": {}, 
+                    "Amortissements - frais fixe de vente": {
+                        " Amortissements - autos": {}, 
+                        " Amortissements - bureau de vente": {}
+                    }, 
+                    "Assurances - camions": {}, 
+                    "Assurances d\u2019autos - vendeurs": {}, 
+                    "Avantages sociaux - frais fixe de vente": {}, 
+                    "Catalogues": {}, 
+                    "D\u00e9penses - bureau de vente": {}, 
+                    "Emballage \u00e0 la livraison": {}, 
+                    "Entretien et r\u00e9parations - camions": {}, 
+                    "Frais de repr\u00e9sentation": {}, 
+                    "Frais de voyages - vendeurs": {}, 
+                    "Frais d\u2019autos - service apr\u00e8s-vente": {}, 
+                    "Frais d\u2019autos - vendeurs": {}, 
+                    "Loyer - bureau de vente": {}, 
+                    "Prototypes et \u00e9chantillons": {}, 
+                    "Publicit\u00e9": {}, 
+                    "Salaires - camionneurs": {}, 
+                    "Salaires - frais fixe de vente": {
+                        "Salaires - exp\u00e9diteurs": {}, 
+                        "Salaires - g\u00e9rants": {}, 
+                        "Salaires - service apr\u00e8s-vente": {}, 
+                        "Salaires - vendeurs": {}
+                    }
+                }, 
+                "Frais fixe d\u2019administration": {
+                    " Assurances d\u2019autos - administration": {}, 
+                    "Amortissements - frais fixe d'administration": {
+                        "Amortissements - autos - frais fixe d'administration": {}, 
+                        "Amortissements - logiciels": {}, 
+                        "Amortissements - mobilier de bureau": {}, 
+                        "Amortissements - \u00e9quipement informatique": {}
+                    }, 
+                    "Avantages sociaux - frais fixe d'administration": {}, 
+                    "Dons et associations": {}, 
+                    "Entretien et r\u00e9parations - bureau": {}, 
+                    "Frais de perception": {}, 
+                    "Frais de voyages - administration": {}, 
+                    "Frais de v\u00e9rification": {}, 
+                    "Frais d\u2019autos - administration": {}, 
+                    "Frais juridiques": {}, 
+                    "Location - \u00e9quipement de bureau": {}, 
+                    "Mauvaises cr\u00e9ances": {}, 
+                    "Papeterie et d\u00e9penses de bureau": {}, 
+                    "Salaires - frais fixe d'administration": {
+                        "Salaires - administration": {}, 
+                        "Salaires - bureau": {}
+                    }, 
+                    "Taxe sur le capital": {}, 
+                    "Taxes, licences, permis": {}, 
+                    "Timbres": {}, 
+                    "T\u00e9l\u00e9communications": {}
+                }
+            }, 
+            "Frais variables": {
+                "Frais variables de fabrication": {
+                    " Emballage \u00e0 la production": {
+                        "account_type": "Cost of Goods Sold"
+                    }, 
+                    " Sous-traitance": {
+                        "account_type": "Cost of Goods Sold"
+                    }, 
+                    "Achats de mati\u00e8res premi\u00e8res": {
+                        "account_type": "Cost of Goods Sold"
+                    }, 
+                    "Achats de mat\u00e9riel direct": {
+                        "account_type": "Cost of Goods Sold"
+                    }, 
+                    "Achats de produits non fabriqu\u00e9s": {
+                        "account_type": "Expenses Included In Valuation"
+                    }, 
+                    "Avantages sociaux": {
+                        "account_type": "Cost of Goods Sold"
+                    }, 
+                    "Main-d\u2019\u0153uvre directe": {
+                        "account_type": "Cost of Goods Sold"
+                    }, 
+                    "Variation des stocks": {
+                        "account_type": "Stock Adjustment"
+                    }, 
+                    "account_type": "Cost of Goods Sold"
+                }, 
+                "Frais variables de vente": {
+                    "Commissions": {}, 
+                    "Redevances": {}, 
+                    "Transport (\u00e0 contrat)": {}
+                }
+            }, 
+            "root_type": "Expense"
+        }, 
+        "Passif": {
+            "PASSIFS NON-COURANTS": {
+                "AUTRES PASSIFS NON-COURANTS": {}, 
+                "DETTES FINANCI\u00c8RES NON-COURANTES": {}, 
+                "IMP\u00d4TS DIFF\u00c9R\u00c9S": {}, 
+                "PROVISIONS POUR RETRAITES ET AUTRES AVANTAGES POST\u00c9RIEURS \u00c0 L'EMPLOI": {}
+            }, 
+            "Passif \u00e0 court terme": {
+                " Commissions \u00e0 payer": {}, 
+                "Assurance collective \u00e0 payer": {}, 
+                "Autres comptes cr\u00e9diteurs": {}, 
+                "Comptes \u00e0 payer": {
+                    "Comptes fournisseurs": {
+                        "account_type": "Payable"
+                    }
+                }, 
+                "D\u00e9p\u00f4ts de clients": {}, 
+                "Emprunt de banque": {}, 
+                "Imp\u00f4ts li\u00e9s aux salaires \u00e0 payer": {
+                    "Agence du revenu du Canada": {
+                        "Assurance - emploi \u00e0 payer": {
+                            "AE - Contribution de l'employeur": {}, 
+                            "AE - Contribution des employ\u00e9s": {}
+                        }, 
+                        "Imp\u00f4t f\u00e9d\u00e9ral sur salaires \u00e0 payer": {}
+                    }, 
+                    "Agence du revenu du Qu\u00e9bec": {
+                        "Fond des Services de Sant\u00e9 \u00e0 payer": {}, 
+                        "Imp\u00f4t provincial sur salaires \u00e0 payer": {}, 
+                        "Normes du Travail \u00e0 payer": {}, 
+                        "Provision pour sant\u00e9 et s\u00e9curit\u00e9 du travail CSST": {}, 
+                        "R\u00e9gime des rentes du Qu\u00e9bec \u00e0 payer": {
+                            "Rentes - Contribution de l'employeur": {}, 
+                            "Rentes - Contribution des employ\u00e9s": {}
+                        }, 
+                        "R\u00e9gime qu\u00e9becois d'assurance parentale": {
+                            "AP - Contribution de l'employeur": {}, 
+                            "AP - Contribution des employ\u00e9s": {}
+                        }
+                    }, 
+                    "Caisse de retraite \u00e0 payer": {}
+                }, 
+                "Imp\u00f4ts \u00e0 payer": {
+                    "Imp\u00f4t f\u00e9d\u00e9ral sur le revenu \u00e0 payer": {}, 
+                    "Imp\u00f4t provincial sur le revenu \u00e0 payer": {}, 
+                    "TPS \u00e0 payer": {}, 
+                    "TVH \u00e0 payer": {
+                        "TVH \u00e0 payer - 13%": {}, 
+                        "TVH \u00e0 payer - 14%": {}, 
+                        "TVH \u00e0 payer - 15%": {}
+                    }, 
+                    "TVP/TVQ \u00e0 payer": {}
+                }, 
+                "Passifs de stock": {
+                    "Stock re\u00e7u non factur\u00e9": {
+                        "account_type": "Stock Received But Not Billed"
+                    }
+                }, 
+                "Provision pour vacances et cong\u00e9s": {}, 
+                "Revenus per\u00e7us d\u2019avance": {}, 
+                "Salaires \u00e0 payer": {}
+            }, 
+            "Passif \u00e0 long terme": {
+                "Avances des actionnaires": {}, 
+                "Cr\u00e9dits d\u2019imp\u00f4ts report\u00e9s": {}, 
+                "Hypoth\u00e8que \u00e0 payer": {}, 
+                "Liens sur machinerie": {}, 
+                "Liens sur mat\u00e9riel roulant": {}, 
+                "Obligation d\u00e9coulant d\u2019un contrat de location - acquisition": {}, 
+                "Passif d\u2019imp\u00f4ts futurs": {}
+            }, 
+            "root_type": "Liability"
+        }, 
+        "Produits": {
+            "Revenus de ventes": {
+                " Escomptes de volume sur ventes": {}, 
+                "Autres produits d'exploitation": {}, 
+                "Ventes": {}, 
+                "Ventes avec des provinces harmonis\u00e9es": {}, 
+                "Ventes avec des provinces non-harmonis\u00e9es": {}, 
+                "Ventes \u00e0 l'\u00e9tranger": {}
+            }, 
+            "Revenus non li\u00e9 \u00e0 la vente": {
+                "Autres revenus non li\u00e9s \u00e0 la vente": {}, 
+                "Revenues d'int\u00e9r\u00eats": {}
+            }, 
+            "root_type": "Income"
+        }
+    }
+}

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

@@ -1,92 +1,351 @@
 {
-  "country_code": "gt",
-  "name": "Guatemala - Cuentas",
-  "tree": {
-    "Activos": {
-      "Activo Corriente": {
-        "Caja y Bancos": {},
-        "Cuentas por Cobrar": {},
-        "Impuestos por Cobrar": {
-          "IVA por Cobrar": {},
-          "Retenciones de IVA recibidas": {}
-        },
-        "Inventario": {
-          "is_group": 1,
-          "account_type": "Stock"
+    "country_code": "gt", 
+    "name": "Guatemala - Cuentas", 
+    "tree": {
+        "02 - Pasivos": {
+            "Pasivo Corriente": {
+                "Acreedores 1": {
+                    "account_type": "Payable"
+                }, 
+                "Cuentas por Pagar": {}, 
+                "Impuestos por Pagar": {}, 
+                "Otras Cuentas por Pagar": {}, 
+                "Prestaciones": {}, 
+                "Proveedores": {
+                    "Inventario Recibido pero No Cobrado": {
+                        "account_type": "Stock Received But Not Billed"
+                    }
+                }, 
+                "Sueldos por Liquidar": {}
+            }, 
+            "Pasivo No Corriente": {
+                "Acreedores": {}, 
+                "Provisi\u00f3n para Indemnizaciones": {}
+            }, 
+            "root_type": "Liability"
+        }, 
+        "03 - 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": {}
+            }, 
+            "root_type": "Asset"
         }
-      },
-      "No Corriente": {
-        "Activos Fijos": {},
-        "Cargos Diferidos": {}
-      },
-      "root_type": "Asset"
-    },
-    "Pasivos": {
-      "Pasivo Corriente": {
-        "Proveedores": {
-          "Inventario Recibido pero No Cobrado": {
-            "account_type": "Stock Received But Not Billed"
-          }
-        },
-        "Impuestos por Pagar": {},
-        "Sueldos por Liquidar": {},
-        "Prestaciones": {},
-        "Cuentas por Pagar": {},
-        "Otras Cuentas por Pagar": {},
-        "Acreedores": {}
-      },
-      "Pasivo No Corriente": {
-        "Provisión para Indemnizaciones": {},
-        "Acreedores": {}
-      },
-      "root_type": "Liability"
-    },
-    "Patrimonio": {
-      "Capital": {},
-      "Utilidades Retenidas": {},
-      "Resultados del Ejercicio": {},
-      "root_type": "Asset"
-    },
-    "Costos": {
-      "Costo de Ventas": {},
-      "Costos Incluidos en la Valuación": {
-        "account_type": "Expenses Included In Valuation"
-      },
-      "Stock Adjustment": {
-        "account_type": "Stock Adjustment"
-      },
-      "root_type": "Expense"
-    },
-    "Gastos": {
-      "Gastos de Personal": {},
-      "Honorarios Profesionales": {},
-      "Servicios Básicos": {},
-      "Alquileres": {},
-      "Seguros": {},
-      "Mantenimiento": {},
-      "Depreciaciones": {},
-      "Gastos Diversos": {},
-      "root_type": "Expense"
-    },
-    "Ingresos": {
-      "Productos": {},
-      "Servicios": {},
-      "root_type": "Income"
-    },
-    "Otros Gastos y Productos Financieros": {
-      "Otros Ingresos": {
-        "Otros Gastos y Productos Financieros": {
-          "Intereses": {},
-          "Otros Gastos Financieros": {}
-        }
-      },
-      "Otros Gastos": {
-        "Otros Gastos y Productos Financieros": {
-          "Intereses": {},
-          "Otros Gastos Financieros": {}
-        }
-      },
-      "root_type": "Expense"
     }
-  }
 }

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

@@ -0,0 +1,856 @@
+{
+	"country_code": "hu", 
+	"name": "Hungary - Chart of Accounts", 
+	"tree": {
+		"1. SZ\u00c1MLAOSZT\u00c1LY BEFEKTETETT ESZK\u00d6Z\u00d6K": {
+			"11. IMMATERI\u00c1LIS JAVAK": {
+				"111. Alap\u00edt\u00e1s-\u00e1tszervez\u00e9s aktiv\u00e1lt \u00e9rt\u00e9ke": {}, 
+				"112. K\u00eds\u00e9rleti fejleszt\u00e9s aktiv\u00e1lt \u00e9rt\u00e9ke": {}, 
+				"113. Vagyoni \u00e9rt\u00e9k\u0171 jogok": {}, 
+				"114. Szellemi term\u00e9kek": {}, 
+				"115. \u00dczleti vagy c\u00e9g\u00e9rt\u00e9k": {}, 
+				"117. Immateri\u00e1lis javak \u00e9rt\u00e9khelyesb\u00edt\u00e9se": {}
+			}, 
+			"12-16. T\u00c1RGYI ESZK\u00d6Z\u00d6K": {
+				"12. INGATLANOK \u00c9S KAPCSOL\u00d3D\u00d3 VAGYONI \u00c9RT\u00c9K\u00db JOGOK": {
+					"121. Telkek, f\u00f6ldter\u00fclet ": {
+						"1211. Telkek, f\u00f6ldter\u00fcletek brutt\u00f3 \u00e9rt\u00e9ke": {
+							"account_type": "Fixed Asset"
+						}, 
+						"1218. Telkek, f\u00f6ldter\u00fcletek terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}, 
+						"1219. Telkek, f\u00f6ldter\u00fcletek terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {}
+					}, 
+					"122. Ingatlanokhoz kapcsol\u00f3d\u00f3 vagyoni \u00e9rt\u00e9k\u0171 jogok": {
+						"1221. Ingatlanokhoz kapcsol\u00f3d\u00f3 vagyoni \u00e9rt\u00e9k\u0171 jogok brutt\u00f3 \u00e9rt\u00e9ke": {
+							"account_type": "Fixed Asset"
+						}, 
+						"1228. Ingatlanokhoz kapcsol\u00f3d\u00f3 vagyoni \u00e9rt\u00e9k\u0171 jogok terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}, 
+						"1229. Ingatlanokhoz kapcsol\u00f3d\u00f3 vagyoni \u00e9rt\u00e9k\u0171 jogok terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {}
+					}, 
+					"123. \u00c9p\u00fcletek, \u00e9p\u00fcletr\u00e9szek, tulajdoni h\u00e1nyadok ": {
+						"account_type": "Fixed Asset", 
+						"is_group": 1
+					}, 
+					"124. Egy\u00e9b ingatlanok": {
+						"is_group": 1
+					}, 
+					"125. \u00dczemk\u00f6r\u00f6n k\u00edv\u00fcli ingatlanok, \u00e9p\u00fcletek ": {
+						"is_group": 1
+					}, 
+					"126. Ingatlanokhoz kapcsol\u00f3d\u00f3 vagyoni \u00e9rt\u00e9k\u0171 jogok": {
+						"is_group": 1
+					}, 
+					"127. Ingatlanok \u00e9rt\u00e9khelyesb\u00edt\u00e9se": {}, 
+					"129. Kis \u00e9rt\u00e9k\u0171 ingatlanok": {}
+				}, 
+				"13. M\u00dbSZAKI BERENDEZ\u00c9SEK, G\u00c9PEK, J\u00c1RM\u00dbVEK": {
+					"131. Termel\u0151 g\u00e9pek, berendez\u00e9sek, szersz\u00e1mok, gy\u00e1rt\u00f3eszk\u00f6z\u00f6k": {
+						"1311. Termel\u0151 g\u00e9pek, berendez\u00e9sek brutt\u00f3 \u00e9rt\u00e9ke": {
+							"account_type": "Fixed Asset"
+						}, 
+						"1318. Termel\u0151 g\u00e9pek, berendez\u00e9sek terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}, 
+						"1319. Termel\u0151 g\u00e9pek, berendez\u00e9sek terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {}
+					}, 
+					"132. M\u0171szaki j\u00e1rm\u0171vek": {}, 
+					"133. Ki nem emelt m\u0171szaki berendez\u00e9sek, g\u00e9pek, j\u00e1rm\u0171vek": {}, 
+					"139. Kis \u00e9rt\u00e9k\u0171 m\u0171szaki berendez\u00e9sek, g\u00e9pek, j\u00e1rm\u0171vek": {}
+				}, 
+				"14. EGY\u00c9B BERENDEZ\u00c9SEK, FELSZEREL\u00c9SEK, J\u00c1RM\u00dbVEK": {
+					"141. Egy\u00e9b (\u00fczemi \u2013 \u00fczleti), berendez\u00e9sek, felszerel\u00e9sek": {
+						"1411. Egy\u00e9b (\u00fczemi \u2013 \u00fczleti), berendez\u00e9sek, felszerel\u00e9sek brutt\u00f3 \u00e9rt\u00e9ke": {
+							"account_type": "Fixed Asset"
+						}, 
+						"1418. Egy\u00e9b (\u00fczemi \u2013 \u00fczleti), berendez\u00e9sek, felszerel\u00e9sek terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}, 
+						"1419. Egy\u00e9b (\u00fczemi \u2013 \u00fczleti), berendez\u00e9sek, felszerel\u00e9sek terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {}
+					}, 
+					"142. Egy\u00e9b j\u00e1rm\u0171vek": {
+						"1421. Egy\u00e9b j\u00e1rm\u0171vek brutt\u00f3 \u00e9rt\u00e9ke": {
+							"account_type": "Fixed Asset"
+						}, 
+						"1428. Egy\u00e9b j\u00e1rm\u0171vek terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}, 
+						"1429. Egy\u00e9b j\u00e1rm\u0171vek terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {}
+					}, 
+					"143. Irodai, igazgat\u00e1si berendez\u00e9sek \u00e9s felszerel\u00e9sek": {
+						"1431. Irodai, igazgat\u00e1si berendez\u00e9sek \u00e9s felszerel\u00e9sek brutt\u00f3 \u00e9rt\u00e9ke": {
+							"account_type": "Fixed Asset"
+						}, 
+						"1438. Irodai, igazgat\u00e1si berendez\u00e9sek \u00e9s felszerel\u00e9sek terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}, 
+						"1439. Irodai, igazgat\u00e1si berendez\u00e9sek \u00e9s felszerel\u00e9sek terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {}
+					}, 
+					"144. Ki nem emelt egy\u00e9b berendez\u00e9sek, felszerel\u00e9sek": {
+						"account_type": "Fixed Asset"
+					}, 
+					"145. J\u00f3l\u00e9ti berendez\u00e9sek, felszerel\u00e9si t\u00e1rgyak \u00e9s k\u00e9pz\u0151m\u0171v\u00e9szeti alkot\u00e1sok": {
+						"account_type": "Fixed Asset"
+					}, 
+					"147. Egy\u00e9b berendez\u00e9sek, felszerel\u00e9sek, j\u00e1rm\u0171vek \u00e9rt\u00e9khelyesb\u00edt\u00e9se": {
+						"account_type": "Fixed Asset"
+					}, 
+					"149. Kis \u00e9rt\u00e9k\u0171 egy\u00e9b berendez\u00e9sek, felszerel\u00e9sek, j\u00e1rm\u0171vek": {
+						"account_type": "Fixed Asset"
+					}
+				}, 
+				"15. TENY\u00c9SZ\u00c1LLATOK": {
+					"151. Teny\u00e9sz\u00e1llatok": {}
+				}, 
+				"16. BERUH\u00c1Z\u00c1SOK, FEL\u00daJ\u00cdT\u00c1SOK": {
+					"161. Befejezetlen beruh\u00e1z\u00e1sok ": {}, 
+					"162. Fel\u00faj\u00edt\u00e1sok": {}, 
+					"168. Beruh\u00e1z\u00e1sok terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {}
+				}, 
+				"17-19. BEFEKTETETT P\u00c9NZ\u00dcGYI ESZK\u00d6Z\u00d6K": {
+					"17. TULAJDONI R\u00c9SZESED\u00c9ST JELENT\u00d5 BEFEKTET\u00c9SEK (R\u00c9SZESED\u00c9SEK)": {
+						"171. Tart\u00f3s r\u00e9szesed\u00e9s kapcsolt v\u00e1llalkoz\u00e1sban": {}, 
+						"172. Egy\u00e9b tart\u00f3s r\u00e9szesed\u00e9s": {}, 
+						"177. R\u00e9szesed\u00e9sek \u00e9rt\u00e9khelyesb\u00edt\u00e9se": {}, 
+						"179. R\u00e9szesed\u00e9sek \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}
+					}, 
+					"18. HITELVISZONYT MEGTESTES\u00cdT\u00d5 \u00c9RT\u00c9KPAP\u00cdROK": {
+						"181. \u00c1llamk\u00f6tv\u00e9nyek": {}, 
+						"182. Kapcsolt v\u00e1llalkoz\u00e1sok \u00e9rt\u00e9kpap\u00edrjai": {}, 
+						"183. Egy\u00e9b v\u00e1llalkoz\u00e1sok \u00e9rt\u00e9kpap\u00edrjai": {}, 
+						"184. Tart\u00f3s diszkont \u00e9rt\u00e9kpap\u00edrok": {}, 
+						"189. \u00c9rt\u00e9kpap\u00edrok \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}
+					}, 
+					"19. TART\u00d3SAN ADOTT K\u00d6LCS\u00d6N\u00d6K (tart\u00f3s bankbet\u00e9tek)": {
+						"191. Tart\u00f3san adott k\u00f6lcs\u00f6n\u00f6k kapcsolt v\u00e1llalkoz\u00e1sban": {}, 
+						"192. Tart\u00f3s bankbet\u00e9tek": {}, 
+						"193. Egy\u00e9b tart\u00f3san adott k\u00f6lcs\u00f6n\u00f6k": {}, 
+						"194. Tart\u00f3s bankbet\u00e9tek kapcsolt v\u00e1llalkoz\u00e1sban": {}, 
+						"195. Tart\u00f3s bankbet\u00e9tek egy\u00e9b r\u00e9szesed\u00e9si viszonyban \u00e1ll\u00f3 v\u00e1llalkoz\u00e1sban": {}, 
+						"196. Egy\u00e9b tart\u00f3s bankbet\u00e9tek": {}, 
+						"197. P\u00e9nz\u00fcgyi l\u00edzing miatti tart\u00f3s k\u00f6vetel\u00e9s": {}, 
+						"199. Tart\u00f3san adott k\u00f6lcs\u00f6n\u00f6k (\u00e9s bankbet\u00e9tek) \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}
+					}
+				}
+			}, 
+			"root_type": "Asset"
+		}, 
+		"2. SZ\u00c1MLAOSZT\u00c1LY K\u00c9SZLETEK": {
+			"21-22. ANYAGOK": {
+				"211 - 219. Nyers- \u00e9s alapanyagok ": {}, 
+				"221. Seg\u00e9danyagok": {}, 
+				"222. \u00dczem- \u00e9s f\u0171t\u0151anyagok ": {}, 
+				"223. Fenntart\u00e1si anyagok ": {}, 
+				"224. \u00c9p\u00edt\u00e9si anyagok": {}, 
+				"225. Egy \u00e9ven bel\u00fcl elhaszn\u00e1l\u00f3d\u00f3 anyagi eszk\u00f6z\u00f6k ": {}, 
+				"226. T\u00e1rgyi eszk\u00f6z\u00f6k k\u00f6z\u00fcl \u00e1tsorolt anyagok": {}, 
+				"227. Egy\u00e9b anyagok": {}, 
+				"228. Anyagok \u00e1rk\u00fcl\u00f6nb\u00f6zete": {}, 
+				"229. Anyagok \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}
+			}, 
+			"23. BEFEJEZETLEN TERMEL\u00c9S \u00c9S F\u00c9LK\u00c9SZ TERM\u00c9KEK": {
+				"231 - 234. Befejezetlen termel\u00e9s ": {
+					"231. Befejezetlen termel\u00e9s": {}, 
+					"232. F\u00e9lk\u00e9sz term\u00e9kek": {}
+				}, 
+				"238. F\u00e9lk\u00e9sz term\u00e9kek k\u00e9szlet\u00e9rt\u00e9k-k\u00fcl\u00f6nb\u00f6zete": {}, 
+				"239. Befejezetlen termel\u00e9s \u00e9s f\u00e9lk\u00e9sz term\u00e9kek \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}
+			}, 
+			"24. N\u00d6VEND\u00c9K-, H\u00cdZ\u00d3- \u00c9S EGY\u00c9B \u00c1LLATOK": {
+				"is_group": 1
+			}, 
+			"25. K\u00c9SZTERM\u00c9KEK": {
+				"251-257. K\u00e9szterm\u00e9kek": {}, 
+				"258. K\u00e9szterm\u00e9kek k\u00e9szlet\u00e9rt\u00e9k-k\u00fcl\u00f6nb\u00f6zete": {}, 
+				"259. K\u00e9szterm\u00e9kek \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}
+			}, 
+			"26-28. \u00c1RUK ": {
+				"261. Kereskedelmi \u00e1ruk": {
+					"account_type": "Stock",
+					"is_group": 0
+				}, 
+				"262. Idegen helyen t\u00e1rolt, bizom\u00e1nyba \u00e1tadott \u00e1ruk": {
+					"account_type": "Stock",
+					"is_group": 0
+				}, 
+				"263. T\u00e1rgyi eszk\u00f6z\u00f6k k\u00f6z\u00fcl \u00e1tsorolt \u00e1ruk": {
+					"account_type": "Stock",
+					"is_group": 0
+				}, 
+				"264. Bels\u0151 (egys\u00e9gek, tev\u00e9kenys\u00e9gek k\u00f6z\u00f6tti) \u00e1tad\u00e1s-\u00e1tv\u00e9tel \u00fctk\u00f6z\u0151sz\u00e1mla": {
+					"account_type": "Stock",
+					"is_group": 0
+				}, 
+				"269. Kereskedelmi \u00e1ruk \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
+					"account_type": "Stock",
+					"is_group": 0
+				}, 
+				"account_type": "Stock"
+			}, 
+			"27. K\u00d6ZVET\u00cdTETT SZOLG\u00c1LTAT\u00c1SOK ": {
+				"271. K\u00f6zvet\u00edtett szolg\u00e1ltat\u00e1sok": {}, 
+				"279. K\u00f6zvet\u00edtett szolg\u00e1ltat\u00e1sok \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}
+			}, 
+			"28. BET\u00c9TD\u00cdJAS G\u00d6NGY\u00d6LEGEK": {
+				"is_group": 1
+			}, 
+			"root_type": "Asset"
+		}, 
+		"3. SZ\u00c1MLAOSZT\u00c1LY K\u00d6VETEL\u00c9SEK, P\u00c9NZ\u00dcGYI ESZK\u00d6Z\u00d6K \u00c9S AKT\u00cdV ID\u00d5BELI ELHAT\u00c1ROL\u00c1SOK": {
+			"31. K\u00d6VETEL\u00c9SEK \u00c1RUSZ\u00c1LL\u00cdT\u00c1SB\u00d3L \u00c9S SZOLG\u00c1LTAT\u00c1SB\u00d3L (VEV\u00d5K) ": {
+				"311. Belf\u00f6ldi k\u00f6vetel\u00e9sek (forintban)": {
+					"account_type": "Receivable"
+				}, 
+				"312. Belf\u00f6ldi k\u00f6vetel\u00e9sek (deviz\u00e1ban)": {
+					"account_type": "Receivable"
+				}, 
+				"315. Belf\u00f6ldi k\u00f6vetel\u00e9sek \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa ": {}, 
+				"316. K\u00fclf\u00f6ldi k\u00f6vetel\u00e9sek (forintban)": {
+					"account_type": "Receivable"
+				}, 
+				"317. K\u00fclf\u00f6ldi k\u00f6vetel\u00e9sek (deviz\u00e1ban)": {
+					"account_type": "Receivable"
+				}, 
+				"319. K\u00fclf\u00f6ldi k\u00f6vetel\u00e9sek \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}
+			}, 
+			"32. K\u00d6VETEL\u00c9SEK KAPCSOLT V\u00c1LLALKOZ\u00c1SSAL SZEMBEN": {
+				"is_group": 1
+			}, 
+			"33. K\u00d6VETEL\u00c9SEK EGY\u00c9B R\u00c9SZESED\u00c9SI VISZONYBAN L\u00c9V\u00d5 V\u00c1LLALKOZ\u00c1SSAL SZEMBEN ": {
+				"is_group": 1
+			}, 
+			"34. V\u00c1LT\u00d3K\u00d6VETEL\u00c9SEK": {
+				"is_group": 1
+			}, 
+			"35. ADOTT EL\u00d5LEGEK": {
+				"351. Immateri\u00e1lis javakra adott el\u0151legek": {}, 
+				"352. Beruh\u00e1z\u00e1sokra adott el\u0151legek": {}, 
+				"353. K\u00e9szletekre adott el\u0151legek": {}, 
+				"358. Jegyzett, de m\u00e9g be nem fizetett t\u0151ke r\u00e9szesed\u00e9si viszonyban nem l\u00e9v\u0151 v\u00e1llalkoz\u00e1st\u00f3l": {}, 
+				"359. Adott el\u0151legek \u00e9rt\u00e9kveszt\u00e9se \u00e9s vissza\u00edr\u00e1sa": {}
+			}, 
+			"36. EGY\u00c9B K\u00d6VETEL\u00c9SEK": {
+				"361. Munkav\u00e1llal\u00f3kkal szembeni k\u00f6vetel\u00e9sek": {
+					"3611. Munkav\u00e1llal\u00f3knak foly\u00f3s\u00edtott el\u0151legek": {}, 
+					"3612. El\u0151\u00edrt tartoz\u00e1sok": {}, 
+					"3613. Egy\u00e9b elsz\u00e1mol\u00e1sok a munkav\u00e1llal\u00f3kkal": {}
+				}, 
+				"362. K\u00f6lts\u00e9gvet\u00e9ssel szembeni k\u00f6vetel\u00e9sek": {
+					"is_group": 1
+				}, 
+				"363. R\u00f6vid lej\u00e1ratra k\u00f6lcs\u00f6nadott p\u00e9nzeszk\u00f6z\u00f6k": {
+					"is_group": 1
+				}, 
+				"364. R\u00e9szesed\u00e9sekkel, \u00e9rt\u00e9kpap\u00edrokkal kapcsolatos k\u00f6vetel\u00e9sek": {
+					"3641. R\u00f6vid lej\u00e1rat\u00fa k\u00f6lcs\u00f6n\u00f6k": {}, 
+					"3642. Tart\u00f3san adott k\u00f6lcs\u00f6n\u00f6kb\u0151l \u00e1tsorolt k\u00f6vetel\u00e9sek": {}
+				}, 
+				"365. V\u00e1s\u00e1rolt \u00e9s kapott k\u00f6vetel\u00e9sek ": {
+					"is_group": 1
+				}, 
+				"366. R\u00e9szesed\u00e9sekkel, \u00e9rt\u00e9kpap\u00edrokkal kapcsolatos k\u00f6vetel\u00e9sek": {}, 
+				"367. Hat\u00e1rid\u0151s, opci\u00f3s \u00e9s swap \u00fcgyletekkel kapcsolatos k\u00f6vetel\u00e9sek": {}, 
+				"368. K\u00fcl\u00f6nf\u00e9le egy\u00e9b k\u00f6vetel\u00e9sek ": {
+					"3681. Bizom\u00e1nyosi \u00fcgylettel kapcsolatos elsz\u00e1mol\u00e1sok": {}, 
+					"3682. \u00c9rt\u00e9kpap\u00edr-elsz\u00e1mol\u00e1si sz\u00e1mla": {}, 
+					"3683. Import beszerz\u00e9sek \u00e1f\u00e1ja": {}, 
+					"3684. Ad\u00f3sok": {}, 
+					"3685. Biztos\u00edt\u00f3int\u00e9zettel szembeni k\u00f6vetel\u00e9sek": {}, 
+					"3686. Barter \u00fcgylet elsz\u00e1mol\u00e1si sz\u00e1mla": {}, 
+					"3687. \u00c1rfolyam k\u00fcl\u00f6nb\u00f6zetek elsz\u00e1mol\u00e1si sz\u00e1mla": {}, 
+					"3688. Ki nem emelt egy\u00e9b k\u00f6vetel\u00e9sek": {}
+				}, 
+				"369. Egy\u00e9b k\u00f6vetel\u00e9sek \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}
+			}, 
+			"37. \u00c9RT\u00c9KPAP\u00cdROK": {
+				"371. R\u00e9szesed\u00e9sek": {
+					"3711. R\u00e9szesed\u00e9s anyav\u00e1llalatban": {}, 
+					"3712. R\u00e9szesed\u00e9s le\u00e1nyv\u00e1llalatban": {}, 
+					"3713. R\u00e9szesed\u00e9s k\u00f6z\u00f6s vezet\u00e9s\u0171 v\u00e1llalkoz\u00e1sban": {}, 
+					"3714. R\u00e9szesed\u00e9s t\u00e1rsult v\u00e1llalkoz\u00e1sban": {}, 
+					"3719. Kapcsolt v\u00e1llalkoz\u00e1sban l\u00e9v\u0151 r\u00e9szesed\u00e9sek \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}
+				}, 
+				"372. Saj\u00e1t r\u00e9szv\u00e9nyek, saj\u00e1t \u00fczletr\u00e9szek": {
+					"3721. Elad\u00e1sra v\u00e1s\u00e1rolt egy\u00e9b r\u00e9szesed\u00e9sek": {}
+				}, 
+				"373. Forgat\u00e1si c\u00e9l\u00fa hitelviszonyt megtestes\u00edt\u0151 \u00e9rt\u00e9kpap\u00edrok ": {
+					"3741. Elad\u00e1sra v\u00e1s\u00e1rolt hitelviszonyt megtestes\u00edt\u0151 \u00e9rt\u00e9kpap\u00edrok": {}, 
+					"3742. Elad\u00e1sra v\u00e1s\u00e1rolt diszkont \u00e9rt\u00e9kpap\u00edrok": {}, 
+					"3749. Forgat\u00e1si c\u00e9l\u00fa hitelviszonyt megtestes\u00edt\u0151 \u00e9rt\u00e9kpap\u00edrok \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}
+				}, 
+				"378. \u00c9rt\u00e9kpap\u00edrok \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}, 
+				"379. \u00c9rt\u00e9kpap\u00edr elsz\u00e1mol\u00e1si sz\u00e1mla": {}
+			}, 
+			"38. P\u00c9NZESZK\u00d6Z\u00d6K": {
+				"381. P\u00e9nzt\u00e1r ": {
+					"3811. P\u00e9nzt\u00e1r-sz\u00e1mla": {}, 
+					"3812. Elektronikus p\u00e9nzeszk\u00f6z\u00f6k ": {}, 
+					"account_type": "Cash"
+				}, 
+				"382. Valutap\u00e9nzt\u00e1r ": {
+					"3821. Valutap\u00e9nzt\u00e1r-sz\u00e1mla": {}, 
+					"3829. Valuta \u00e1rfolyamk\u00fcl\u00f6nb\u00f6zeti sz\u00e1mla ": {}
+				}, 
+				"383. Csekkek": {}, 
+				"384. Elsz\u00e1mol\u00e1si bet\u00e9tsz\u00e1mla ": {
+					"account_type": "Bank", 
+					"is_group": 1
+				}, 
+				"385. Elk\u00fcl\u00f6n\u00edtett bet\u00e9tsz\u00e1ml\u00e1k ": {
+					"3851. Kamatoz\u00f3 bet\u00e9tsz\u00e1ml\u00e1k": {}, 
+					"3852. Elk\u00fcl\u00f6n\u00edtett p\u00e9nzeszk\u00f6z\u00f6k k\u00f6tv\u00e9nykibocs\u00e1t\u00e1sb\u00f3l ": {}, 
+					"3853. Beruh\u00e1z\u00e1sra elk\u00fcl\u00f6n\u00edtett p\u00e9nzeszk\u00f6z\u00f6k": {}, 
+					"3854. Fejleszt\u00e9si c\u00e9lra elk\u00fcl\u00f6n\u00edtett p\u00e9nzeszk\u00f6z\u00f6k ": {}, 
+					"3855. Egy\u00e9b c\u00e9lra elk\u00fcl\u00f6n\u00edtett p\u00e9nzeszk\u00f6z\u00f6k": {}, 
+					"3856. Lak\u00e1s\u00e9p\u00edt\u00e9si bet\u00e9tsz\u00e1mla": {}, 
+					"3857. Elk\u00fcl\u00f6n\u00edtett lak\u00e1s\u00e9p\u00edt\u00e9si c\u00e9l\u00fa p\u00e9nzeszk\u00f6z\u00f6k ": {}, 
+					"3858. Lak\u00e1s\u00e9p\u00edt\u00e9s \u00faton l\u00e9v\u0151 p\u00e9nzeszk\u00f6zei": {}
+				}, 
+				"386. Devizabet\u00e9t-sz\u00e1mla ": {
+					"3861. Devizabet\u00e9t-sz\u00e1mla": {}, 
+					"3862. K\u00fclf\u00f6ld\u00f6n vezetett devizabet\u00e9t-sz\u00e1mla ": {}, 
+					"3863. Devizat\u00f6rzsbet\u00e9t-sz\u00e1mla": {}, 
+					"3868. Egy\u00e9b devizabet\u00e9t-sz\u00e1mla": {}, 
+					"3869. Devizabet\u00e9t \u00e1rfolyamk\u00fcl\u00f6nb\u00f6zeti sz\u00e1mla ": {}
+				}, 
+				"387. Elektronikus p\u00e9nz": {}, 
+				"389. \u00c1tvezet\u00e9si sz\u00e1mla": {}
+			}, 
+			"39. AKT\u00cdV ID\u00d5BELI ELHAT\u00c1ROL\u00c1SOK": {
+				"391. Bev\u00e9telek akt\u00edv id\u0151beli elhat\u00e1rol\u00e1sa ": {
+					"3911. Diszkont \u00e9rt\u00e9kpap\u00edrok id\u0151ar\u00e1nyos kamat\u00e1nak elhat\u00e1rol\u00e1sa": {}, 
+					"3912. \u00c9rt\u00e9kpap\u00edrok beszerz\u00e9s\u00e9hez kapcsol\u00f3d\u00f3 k\u00fcl\u00f6nb\u00f6zetb\u0151l az id\u0151ar\u00e1nyos \u00e1rfolyamnyeres\u00e9g elhat\u00e1rol\u00e1sa": {}, 
+					"3913. \u00c1rbev\u00e9tel, egy\u00e9b kamatbev\u00e9tel, egy\u00e9b bev\u00e9tel elhat\u00e1rol\u00e1sa": {}
+				}, 
+				"392. K\u00f6lts\u00e9gek, r\u00e1ford\u00edt\u00e1sok akt\u00edv id\u0151beli elhat\u00e1rol\u00e1sa ": {
+					"3921. \u00c9rt\u00e9kpap\u00edrok, r\u00e9szesed\u00e9sek beszerz\u00e9s\u00e9hez kapcsol\u00f3d\u00f3 bizom\u00e1nyi d\u00edj, v\u00e1s\u00e1rolt v\u00e9teli opci\u00f3 d\u00edj\u00e1nak elhat\u00e1rol\u00e1sa": {}, 
+					"3922. T\u00f6bbletk\u00f6telezetts\u00e9gek elhat\u00e1rol\u00e1sa": {}, 
+					"3923. K\u00f6lts\u00e9gek, egy\u00e9b fizetett kamatok, egy\u00e9b r\u00e1ford\u00edt\u00e1sok elhat\u00e1rol\u00e1sa": {}
+				}, 
+				"393. Halasztott r\u00e1ford\u00edt\u00e1sok ": {
+					"3931. Tartoz\u00e1s\u00e1tv\u00e1llal\u00e1sok miatti r\u00e1ford\u00edt\u00e1sok elhat\u00e1rol\u00e1sa": {}, 
+					"3932. Devizak\u00f6telezetts\u00e9gek \u00e1rfolyamvesztes\u00e9g\u00e9nek elhat\u00e1rol\u00e1sa ": {}
+				}, 
+				"399. A k\u00f6vetel\u00e9s-jelleg\u0171 akt\u00edv id\u0151beli elhat\u00e1rol\u00e1sok \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}
+			}, 
+			"root_type": "Asset"
+		}, 
+		"4. SZ\u00c1MLAOSZT\u00c1LY FORR\u00c1SOK": {
+			"41. SAJ\u00c1T T\u00d5KE": {
+				"411. Jegyzett\u0151ke ": {}, 
+				"412. T\u0151ketartal\u00e9k": {}, 
+				"413. Eredm\u00e9nytartal\u00e9k": {}, 
+				"414. Lek\u00f6t\u00f6tt tartal\u00e9k ": {
+					"4141. Lek\u00f6t\u00f6tt tartal\u00e9k t\u0151ketartal\u00e9kb\u00f3l": {}, 
+					"4142. Lek\u00f6t\u00f6tt tartal\u00e9k eredm\u00e9nytartal\u00e9kb\u00f3l": {}, 
+					"4143. Lek\u00f6t\u00f6tt tartal\u00e9k p\u00f3tbefizet\u00e9sb\u0151l ": {}
+				}, 
+				"417. \u00c9rt\u00e9kel\u00e9si tartal\u00e9k": {}, 
+				"418. El\u0151z\u0151 \u00e9vek helyesb\u00edt\u00e9s\u00e9b\u0151l sz\u00e1rmaz\u00f3 m\u00e9rleg szerinti eredm\u00e9ny": {}, 
+				"419. Ad\u00f3zott eredm\u00e9ny": {}
+			}, 
+			"42. C\u00c9LTARTAL\u00c9KOK": {
+				"421. C\u00e9ltartal\u00e9k a v\u00e1rhat\u00f3 k\u00f6telezetts\u00e9gekre ": {}, 
+				"422. C\u00e9ltartal\u00e9k a j\u00f6v\u0151beni k\u00f6lts\u00e9gekre": {}, 
+				"424. \u00c1rfolyamvesztes\u00e9g id\u0151beli elhat\u00e1rol\u00e1sa alapj\u00e1n k\u00e9pzett c\u00e9ltartal\u00e9k ": {}, 
+				"429. Egy\u00e9b c\u00e9ltartal\u00e9k": {}
+			}, 
+			"43-47. K\u00d6TELEZETTS\u00c9GEK": {
+				"43. H\u00c1TRASOROLT K\u00d6TELEZETTS\u00c9GEK": {
+					"431. H\u00e1trasorolt k\u00f6telezetts\u00e9gek kapcsolt v\u00e1llalkoz\u00e1ssal szemben ": {
+						"4311. H\u00e1trasorolt k\u00f6telezetts\u00e9gek anyav\u00e1llalattal szemben ": {}, 
+						"4312. H\u00e1trasorolt k\u00f6telezetts\u00e9gek le\u00e1nyv\u00e1llalattal szemben": {}, 
+						"4313. H\u00e1trasorolt k\u00f6telezetts\u00e9gek k\u00f6z\u00f6s vezet\u00e9s\u0171 v\u00e1llalkoz\u00e1ssal szemben ": {}, 
+						"4314. H\u00e1trasorolt k\u00f6telezetts\u00e9gek t\u00e1rsult v\u00e1llalkoz\u00e1ssal szemben ": {}
+					}, 
+					"432. H\u00e1trasorolt k\u00f6telezetts\u00e9gek egy\u00e9b r\u00e9szesed\u00e9si viszonyban l\u00e9v\u0151 v\u00e1llalkoz\u00e1ssal szemben": {}, 
+					"433. H\u00e1trasorolt k\u00f6telezetts\u00e9gek egy\u00e9b gazd\u00e1lkod\u00f3val szemben": {}
+				}, 
+				"44. HOSSZ\u00da LEJ\u00c1RAT\u00da K\u00d6TELEZETTS\u00c9GEK": {
+					"441. Hossz\u00fa lej\u00e1ratra kapott k\u00f6lcs\u00f6n\u00f6k": {}, 
+					"442. \u00c1tv\u00e1ltoztathat\u00f3 k\u00f6tv\u00e9nyek ": {}, 
+					"443. Tartoz\u00e1sok k\u00f6tv\u00e9nykibocs\u00e1t\u00e1sb\u00f3l ": {
+						"4431. Tartoz\u00e1sok k\u00f6tv\u00e9nykibocs\u00e1t\u00e1sb\u00f3l forintban ": {}, 
+						"4432. Tartoz\u00e1sok k\u00f6tv\u00e9nykibocs\u00e1t\u00e1sb\u00f3l deviz\u00e1ban": {}
+					}, 
+					"444. Beruh\u00e1z\u00e1si \u00e9s fejleszt\u00e9si hitelek ": {
+						"4441. Beruh\u00e1z\u00e1si \u00e9s fejleszt\u00e9si hitelek forintban ": {}, 
+						"4442. Beruh\u00e1z\u00e1si \u00e9s fejleszt\u00e9si hitelek deviz\u00e1ban ": {}
+					}, 
+					"445. Egy\u00e9b hossz\u00fa lej\u00e1rat\u00fa hitelek ": {
+						"4451. Egy\u00e9b hossz\u00fa lej\u00e1rat\u00fa hitelek forintban ": {}, 
+						"4452. Egy\u00e9b hossz\u00fa lej\u00e1rat\u00fa hitelek deviz\u00e1ban": {}
+					}, 
+					"446. Tart\u00f3s k\u00f6telezetts\u00e9gek kapcsolt v\u00e1llalkoz\u00e1ssal szemben ": {
+						"is_group": 1
+					}, 
+					"447. Tart\u00f3s k\u00f6telezetts\u00e9gek egy\u00e9b r\u00e9szesed\u00e9si viszonyban l\u00e9v\u0151 v\u00e1llalkoz\u00e1ssal szemben": {}, 
+					"448. P\u00e9nz\u00fcgyi l\u00edzing miatti k\u00f6telezetts\u00e9gek ": {}, 
+					"449. Egy\u00e9b hossz\u00fa lej\u00e1rat\u00fa k\u00f6telezetts\u00e9gek ": {
+						"4491. Kincst\u00e1ri vagyon r\u00e9sz\u00e9t k\u00e9pez\u0151 eszk\u00f6z\u00f6k kezel\u00e9sbe v\u00e9tel\u00e9hez kapcsol\u00f3d\u00f3 k\u00f6telezetts\u00e9g": {}, 
+						"4492. Alap\u00edt\u00f3kkal szembeni hossz\u00fa lej\u00e1rat\u00fa k\u00f6telezetts\u00e9gek ": {}
+					}, 
+					"4499. Hossz\u00fa lej\u00e1rat\u00fa egy\u00e9b k\u00f6telezetts\u00e9gek": {}
+				}, 
+				"45-47. R\u00d6VID LEJ\u00c1RAT\u00da K\u00d6TELEZETTS\u00c9GEK": {
+					"451. R\u00f6vid lej\u00e1rat\u00fa k\u00f6lcs\u00f6n\u00f6k ": {
+						"4511. R\u00f6vid lej\u00e1rat\u00fa \u00e1tv\u00e1ltoztathat\u00f3 k\u00f6tv\u00e9nyek ": {}, 
+						"4512. Egy\u00e9b r\u00f6vid lej\u00e1rat\u00fa k\u00f6lcs\u00f6n\u00f6k": {}
+					}, 
+					"452. R\u00f6vid lej\u00e1rat\u00fa hitelek ": {
+						"4521. R\u00f6vid lej\u00e1rat\u00fa hitelek forintban ": {}, 
+						"4522. R\u00f6vid lej\u00e1rat\u00fa hitelek deviz\u00e1ban ": {}
+					}, 
+					"453. Vev\u0151kt\u0151l kapott el\u0151legek": {}, 
+					"454-456. K\u00f6telezetts\u00e9gek \u00e1rusz\u00e1ll\u00edt\u00e1sb\u00f3l \u00e9s szolg\u00e1ltat\u00e1sb\u00f3l (sz\u00e1ll\u00edt\u00f3k)": {
+						"454. Sz\u00e1ll\u00edt\u00f3k ": {
+							"4541. Belf\u00f6ldi anyag- \u00e9s \u00e1rusz\u00e1ll\u00edt\u00f3k ": {
+								"account_type": "Payable"
+							}, 
+							"4542. K\u00fclf\u00f6ldi anyag- \u00e9s \u00e1rusz\u00e1ll\u00edt\u00f3k ": {
+								"account_type": "Payable"
+							}, 
+							"4543. Belf\u00f6ldi szolg\u00e1ltat\u00f3k": {}, 
+							"4544. K\u00fclf\u00f6ldi szolg\u00e1ltat\u00f3k": {}, 
+							"4549. Nem sz\u00e1ml\u00e1zott sz\u00e1ll\u00edt\u00e1sok, szolg\u00e1ltat\u00e1sok ": {
+								"account_type": "Stock Received But Not Billed"
+							}
+						}, 
+						"455. Beruh\u00e1z\u00e1si sz\u00e1ll\u00edt\u00f3k ": {
+							"4551. Belf\u00f6ldi beruh\u00e1z\u00e1si sz\u00e1ll\u00edt\u00f3k ": {}, 
+							"4552. K\u00fclf\u00f6ldi beruh\u00e1z\u00e1si sz\u00e1ll\u00edt\u00f3k": {}, 
+							"4559. Nem sz\u00e1ml\u00e1zott beruh\u00e1z\u00e1si sz\u00e1ll\u00edt\u00f3k ": {}
+						}, 
+						"456. Nem sz\u00e1ml\u00e1zott sz\u00e1ll\u00edt\u00f3k": {}
+					}, 
+					"457. V\u00e1lt\u00f3tartoz\u00e1sok": {}, 
+					"458. R\u00f6vid lej\u00e1rat\u00fa k\u00f6telezetts\u00e9gek kapcsolt v\u00e1llalkoz\u00e1ssal szemben ": {
+						"4581. R\u00f6vid lej\u00e1rat\u00fa k\u00f6telezetts\u00e9gek anyav\u00e1llalattal szemben ": {}, 
+						"4582. R\u00f6vid lej\u00e1rat\u00fa k\u00f6telezetts\u00e9gek le\u00e1nyv\u00e1llalattal szemben": {}, 
+						"4583. R\u00f6vid lej\u00e1rat\u00fa k\u00f6telezetts\u00e9gek k\u00f6z\u00f6s vezet\u00e9s\u0171 v\u00e1llalkoz\u00e1ssal szemben": {}, 
+						"4584. R\u00f6vid lej\u00e1rat\u00fa k\u00f6telezetts\u00e9gek t\u00e1rsult v\u00e1llalkoz\u00e1ssal szemben": {}
+					}, 
+					"459. R\u00f6vid lej\u00e1rat\u00fa k\u00f6telezetts\u00e9gek egy\u00e9b r\u00e9szesed\u00e9si viszonyban l\u00e9v\u0151 v\u00e1llalkoz\u00e1ssal szemben": {}, 
+					"461-479. Egy\u00e9b r\u00f6vid lej\u00e1rat\u00fa k\u00f6telezetts\u00e9gek": {
+						"461. Eredm\u00e9nyt terhel\u0151 ad\u00f3k elsz\u00e1mol\u00e1sa": {
+							"4611. T\u00e1rsas\u00e1gi ad\u00f3 elsz\u00e1mol\u00e1sa ": {}, 
+							"4612. K\u00fcl\u00f6nad\u00f3 elsz\u00e1mol\u00e1sa ": {}, 
+							"4613. Egyszer\u0171s\u00edtett v\u00e1llalkoz\u00f3i ad\u00f3 elsz\u00e1mol\u00e1sa ": {}
+						}, 
+						"462. Szem\u00e9lyi j\u00f6vedelemad\u00f3 elsz\u00e1mol\u00e1sa ": {
+							"4612. Mag\u00e1nszem\u00e9lyekt\u0151l levont szem\u00e9lyi j\u00f6vedelem ad\u00f3 elsz\u00e1mol\u00e1sa ": {}, 
+							"4621. Kifizet\u0151t terhel\u0151  szem\u00e9lyi j\u00f6vedelem ad\u00f3 elsz\u00e1mol\u00e1sa ": {}
+						}, 
+						"463. K\u00f6lts\u00e9gvet\u00e9si befizet\u00e9si k\u00f6telezetts\u00e9gek ": {
+							"463-1. Nyugd\u00edjj\u00e1rul\u00e9k ": {}, 
+							"463-10. Innov\u00e1ci\u00f3s j\u00e1rul\u00e9k  ": {}, 
+							"463-11. \u00d6nellen\u0151rz\u00e9si p\u00f3tl\u00e9k  ": {}, 
+							"463-12. Mulaszt\u00e1si b\u00edrs\u00e1g, ad\u00f3b\u00edrs\u00e1g  ": {}, 
+							"463-13. K\u00e9sedelmi p\u00f3tl\u00e9k ": {}, 
+							"463-14. Egy\u00e9b k\u00f6lts\u00e9gvet\u00e9si befizet\u00e9si k\u00f6telezetts\u00e9gek ": {}, 
+							"463-2. Eg\u00e9szs\u00e9gbiztos\u00edt\u00e1si- \u00e9s munkaer\u0151  piaci j\u00e1rul\u00e9k ": {}, 
+							"463-3. Rehabilit\u00e1ci\u00f3s hozz\u00e1j\u00e1rul\u00e1s  ": {}, 
+							"463-4. Szoci\u00e1lis hozz\u00e1j\u00e1rul\u00e1si ad\u00f3  ": {}, 
+							"463-5. Eg\u00e9szs\u00e9g\u00fcgyi szolg\u00e1ltat\u00e1si j\u00e1rul\u00e9k ": {}, 
+							"463-6. Szakk\u00e9pz\u00e9si hozz\u00e1j\u00e1rul\u00e1s ": {}, 
+							"463-7. Eg\u00e9szs\u00e9g\u00fcgyi hozz\u00e1j\u00e1rul\u00e1s  ": {}, 
+							"463-8. Egyszer\u0171s\u00edtett foglalkoztat\u00e1s k\u00f6zterhe ": {}, 
+							"463-9. C\u00e9gaut\u00f3ad\u00f3 ": {}
+						}, 
+						"464. G\u00e9pj\u00e1rm\u0171 ad\u00f3 (c\u00e9gaut\u00f3ad\u00f3) elsz\u00e1mol\u00e1sa": {
+							"is_group": 1
+						}, 
+						"465. V\u00e1m- \u00e9s p\u00e9nz\u00fcgy\u0151rs\u00e9g elsz\u00e1mol\u00e1si sz\u00e1mla ": {
+							"4651. V\u00e1mk\u00f6lts\u00e9gek \u00e9s egy\u00e9b v\u00e1mterhek elsz\u00e1mol\u00e1si sz\u00e1mla": {}, 
+							"4652. Importbeszerz\u00e9s ut\u00e1n fizetend\u0151 \u00e1ltal\u00e1nos forgalmi ad\u00f3 elsz\u00e1mol\u00e1si sz\u00e1mla": {}, 
+							"4653. V\u00e1m- \u00e9s p\u00e9nz\u00fcgy\u0151rs\u00e9ggel kapcsolatos egy\u00e9b elsz\u00e1mol\u00e1sok ": {}
+						}, 
+						"466. El\u0151zetesen felsz\u00e1m\u00edtott \u00e1ltal\u00e1nos forgalmi ad\u00f3 ": {
+							"4661. Beszerz\u00e9sek el\u0151zetesen felsz\u00e1m\u00edtott \u00e1ltal\u00e1nos forgalmi ad\u00f3ja ": {}, 
+							"4662. Ar\u00e1nyos\u00edt\u00e1ssal megosztand\u00f3 el\u0151zetesen felsz\u00e1m\u00edtott \u00e1ltal\u00e1nos forgalmi ad\u00f3": {}
+						}, 
+						"467. Fizetend\u0151 \u00e1ltal\u00e1nos forgalmi ad\u00f3": {}, 
+						"468. \u00c1ltal\u00e1nos forgalmi ad\u00f3 elsz\u00e1mol\u00e1si sz\u00e1mla ": {}, 
+						"469. Helyi ad\u00f3k elsz\u00e1mol\u00e1si sz\u00e1mla ": {
+							"4691. \u00c9p\u00edtm\u00e9nyad\u00f3 elsz\u00e1mol\u00e1si sz\u00e1mla ": {}, 
+							"4692. Telekad\u00f3 elsz\u00e1mol\u00e1si sz\u00e1mla": {}, 
+							"4693. Kommun\u00e1lis ad\u00f3 elsz\u00e1mol\u00e1si sz\u00e1mla ": {}, 
+							"4694. Idegenforgalmi ad\u00f3 elsz\u00e1mol\u00e1si sz\u00e1mla ": {}, 
+							"4695. Helyi ipar\u0171z\u00e9si ad\u00f3 elsz\u00e1mol\u00e1si sz\u00e1mla ": {}, 
+							"4696. G\u00e9pj\u00e1rm\u0171ad\u00f3 elsz\u00e1mol\u00e1si sz\u00e1mla": {}, 
+							"4697. K\u00fclf\u00f6ldi g\u00e9pj\u00e1rm\u0171ad\u00f3 elsz\u00e1mol\u00e1si sz\u00e1mla ": {}, 
+							"4699. Egy\u00e9b helyi ad\u00f3 elsz\u00e1mol\u00e1si sz\u00e1mla": {}
+						}, 
+						"471. J\u00f6vedelemelsz\u00e1mol\u00e1si sz\u00e1mla ": {
+							"4711. Keresetelsz\u00e1mol\u00e1si sz\u00e1mla ": {}, 
+							"4712. T\u00e1rsadalombiztos\u00edt\u00e1si ell\u00e1t\u00e1s ": {}, 
+							"4713. Egy\u00e9b kifizet\u00e9sek elsz\u00e1mol\u00e1sa": {}
+						}, 
+						"472. Fel nem vett j\u00e1rand\u00f3s\u00e1gok": {}, 
+						"473. Elsz\u00e1mol\u00e1s a t\u00e1rsadalombiztos\u00edt\u00e1ssal ": {}, 
+						"474. Szakk\u00e9pz\u00e9si hozz\u00e1j\u00e1rul\u00e1s": {
+							"4741. K\u00f6zponti m\u0171szaki fejleszt\u00e9si hozz\u00e1j\u00e1rul\u00e1s": {}, 
+							"4742. Elsz\u00e1mol\u00e1sra kapott p\u00e9nzeszk\u00f6z\u00f6k": {}, 
+							"4743. K\u00f6rnyezetv\u00e9delmi term\u00e9k d\u00edjfizet\u00e9si k\u00f6telezetts\u00e9g ": {}, 
+							"4749. Egy\u00e9b befizet\u00e9sek az elk\u00fcl\u00f6n\u00edtett alapokba": {}
+						}, 
+						"475. Eg\u00e9szs\u00e9g\u00fcgyi hozz\u00e1j\u00e1rul\u00e1s (EHO) elsz\u00e1mol\u00e1sa": {}, 
+						"476. Egy\u00e9b \u00e1llami ad\u00f3hat\u00f3s\u00e1ggal szembeni k\u00f6telezetts\u00e9g elsz\u00e1mol\u00e1sa": {
+							"4761. K\u00e1rt\u00e9r\u00edt\u00e9s": {}, 
+							"4762. B\u00edr\u00f3i letilt\u00e1s": {}, 
+							"4763. Banki-elsz\u00e1mol\u00e1s": {}, 
+							"4764. Levont szakszervezeti d\u00edj": {}, 
+							"4765. Mag\u00e1n nyugd\u00edjp\u00e9nzt\u00e1ri befizet\u00e9si k\u00f6telezetts\u00e9gek": {}
+						}, 
+						"477. R\u00f6vid lej\u00e1rat\u00fa egy\u00e9b k\u00f6telezetts\u00e9gek munkav\u00e1llal\u00f3kkal \u00e9s tulajdonosokkal szemben": {}, 
+						"478. R\u00e9szesed\u00e9sekkel, \u00e9rt\u00e9kpap\u00edrokkal kapcsolatos k\u00f6telezetts\u00e9gek ": {}, 
+						"479. K\u00fcl\u00f6nf\u00e9le r\u00f6vid lej\u00e1rat\u00fa egy\u00e9b befizet\u00e9si k\u00f6telezetts\u00e9gek ": {
+							"4791. Biztos\u00edt\u00f3 int\u00e9zetekkel szembeni k\u00f6telezetts\u00e9gek": {}, 
+							"4792. Hitelez\u0151k": {}, 
+							"4793. \u00c1tv\u00e1llalt k\u00f6telezetts\u00e9gek": {}, 
+							"4794. Beszerz\u00e9si \u00e1rba beletartoz\u00f3 el\u0151\u00edrt egy\u00e9b k\u00f6telezetts\u00e9gek ": {}, 
+							"4795. Egy\u00e9b r\u00f6vid lej\u00e1rat\u00fa el\u0151\u00edrt k\u00f6telezetts\u00e9gek": {}
+						}
+					}
+				}
+			}, 
+			"48. PASSZ\u00cdV ID\u00d5BELI ELHAT\u00c1ROL\u00c1SOK": {
+				"481. Bev\u00e9telek passz\u00edv id\u0151beli elhat\u00e1rol\u00e1sa ": {
+					"4811. Befolyt, elsz\u00e1molt bev\u00e9telek elhat\u00e1rol\u00e1sa": {}, 
+					"4812. K\u00f6lts\u00e9gek ellent\u00e9telez\u00e9s\u00e9re kapott t\u00e1mogat\u00e1sok elhat\u00e1rol\u00e1sa": {}, 
+					"4813. Devizaeszk\u00f6z\u00f6k \u00e9s devizak\u00f6telezetts\u00e9gek m\u00e9rlegfordul\u00f3napi \u00e9rt\u00e9kel\u00e9se \u00e1rfolyamnyeres\u00e9g\u00e9nek elhat\u00e1rol\u00e1sa": {}
+				}, 
+				"482. K\u00f6lts\u00e9gek, r\u00e1ford\u00edt\u00e1sok passz\u00edv id\u0151beli elhat\u00e1rol\u00e1sa ": {
+					"4821. M\u00e9rlegfordul\u00f3nap el\u0151tti id\u0151szakot terhel\u0151 k\u00f6lts\u00e9gek, r\u00e1ford\u00edt\u00e1sok elhat\u00e1rol\u00e1sa": {}, 
+					"4822. \u00c9rt\u00e9kpap\u00edrok beszerz\u00e9s\u00e9hez kapcsol\u00f3d\u00f3 k\u00fcl\u00f6nb\u00f6zetb\u0151l az id\u0151ar\u00e1nyos \u00e1rfolyam\u008fvesztes\u00e9g elhat\u00e1rol\u00e1sa": {}, 
+					"4823. Fizetend\u0151 kamatok elhat\u00e1rol\u00e1sa ": {}
+				}, 
+				"483. Halasztott bev\u00e9telek ": {}
+			}, 
+			"49. \u00c9VI M\u00c9RLEGSZ\u00c1ML\u00c1K": {
+				"491. Nyit\u00f3m\u00e9rleg sz\u00e1mla ": {}, 
+				"492. Z\u00e1r\u00f3m\u00e9rleg sz\u00e1mla": {}, 
+				"493. Ad\u00f3zott eredm\u00e9ny elsz\u00e1mol\u00e1si sz\u00e1mla": {}, 
+				"494. El\u0151z\u0151 \u00e9vi ad\u00f3zott eredm\u00e9ny elsz\u00e1mol\u00e1sa": {}
+			}, 
+			"root_type": "Liability"
+		}, 
+		"5. SZ\u00c1MLAOSZT\u00c1LY K\u00d6LTS\u00c9GNEMEK": {
+			"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": {}, 
+						"5112. Seg\u00e9danyag k\u00f6lts\u00e9gek": {}, 
+						"5113. \u00dczemanyag k\u00f6lts\u00e9gek": {}, 
+						"5114. Egy \u00e9ven bel\u00fcl elhaszn\u00e1l\u00f3d\u00f3 gy\u00e1rt\u00f3eszk\u00f6z\u00f6k, berendez\u00e9sek, felszerel\u00e9sek \u00e9s egy\u00e9b eszk\u00f6z\u00f6k k\u00f6lts\u00e9gei": {}, 
+						"5115. Egy \u00e9ven bel\u00fcl elhaszn\u00e1l\u00f3d\u00f3 munkaruha, v\u00e9d\u0151ruha felhaszn\u00e1l\u00e1s k\u00f6lts\u00e9gei": {}, 
+						"5116. Nyomtatv\u00e1nyok, irodaszerek k\u00f6lts\u00e9gei": {}, 
+						"5117. F\u0171t\u0151anyag k\u00f6lts\u00e9gek": {}, 
+						"5118. Villamosenergia felhaszn\u00e1l\u00e1s \u00e9s v\u00edzfelhaszn\u00e1l\u00e1s k\u00f6lts\u00e9gei": {}, 
+						"5119. Egy\u00e9b anyagfelhaszn\u00e1l\u00e1s k\u00f6lts\u00e9gei": {}, 
+						"512. Egy \u00e9ven bel\u00fcl elhaszn\u00e1l\u00f3d\u00f3 anyagi eszk\u00f6z\u00f6k k\u00f6lts\u00e9gei ": {}, 
+						"5121. V\u00e1s\u00e1rolt n\u00f6vend\u00e9k\u00e1llatok k\u00f6lts\u00e9gei": {}, 
+						"5122. V\u00e1s\u00e1rolt h\u00edz\u00f3\u00e1llatok k\u00f6lts\u00e9gei": {}, 
+						"5123. V\u00e1s\u00e1rolt egy\u00e9b \u00e1llatok k\u00f6lts\u00e9gei": {}, 
+						"513. Egy\u00e9b anyagk\u00f6lts\u00e9g": {}, 
+						"519. Anyagk\u00f6lts\u00e9g megt\u00e9r\u00fcl\u00e9s": {}
+					}
+				}, 
+				"52. IG\u00c9NYBE VETT SZOLG\u00c1LTAT\u00c1SOK K\u00d6LTS\u00c9GEI": {
+					"521. Sz\u00e1ll\u00edt\u00e1s-rakod\u00e1s, rakt\u00e1roz\u00e1s k\u00f6lts\u00e9gei": {}, 
+					"522. B\u00e9rleti d\u00edjak": {}, 
+					"523. Karbantart\u00e1si k\u00f6lts\u00e9gek": {}, 
+					"524. Hirdet\u00e9s, rekl\u00e1m, propaganda k\u00f6lts\u00e9gek": {}, 
+					"525. Oktat\u00e1s \u00e9s tov\u00e1bbk\u00e9pz\u00e9s k\u00f6lts\u00e9gei": {}, 
+					"526. Utaz\u00e1si \u00e9s kik\u00fcldet\u00e9si k\u00f6lts\u00e9gek (napid\u00edj n\u00e9lk\u00fcl)": {}, 
+					"529. Ig\u00e9nybe vett egy\u00e9b szolg\u00e1ltat\u00e1sok k\u00f6lts\u00e9gei": {}
+				}, 
+				"53. EGY\u00c9B SZOLG\u00c1LTAT\u00c1SOK K\u00d6LTS\u00c9GEI": {
+					"531. Hat\u00f3s\u00e1gi igazgat\u00e1si, szolg\u00e1ltat\u00e1si d\u00edjak, illet\u00e9kek": {}, 
+					"532. P\u00e9nz\u00fcgyi, befektet\u00e9si szolg\u00e1ltat\u00e1si d\u00edjak": {}, 
+					"533. Biztos\u00edt\u00e1si d\u00edj ": {}, 
+					"534. K\u00f6lts\u00e9gk\u00e9nt elsz\u00e1moland\u00f3 ad\u00f3k, j\u00e1rul\u00e9kok, term\u00e9kd\u00edjak": {}, 
+					"539. K\u00fcl\u00f6nf\u00e9le egy\u00e9b szolg\u00e1ltat\u00e1sok k\u00f6lts\u00e9gei": {}
+				}
+			}, 
+			"54 - 56. SZEM\u00c9LYI JELLEG\u00db R\u00c1FORD\u00cdT\u00c1SOK": {
+				"54. B\u00c9RK\u00d6LTS\u00c9G ": {
+					"541. B\u00e9rk\u00f6lts\u00e9g": {}, 
+					"542. Tulajdonos szem\u00e9lyes k\u00f6zrem\u0171k\u00f6d\u00e9s\u00e9nek ellen\u00e9rt\u00e9ke": {}, 
+					"543. Sz\u00f6vetkezeti tagok munkad\u00edja": {}
+				}, 
+				"55. SZEM\u00c9LYI JELLEG\u00db EGY\u00c9B KIFIZET\u00c9SEK": {
+					"551. Munkav\u00e1llal\u00f3knak, tagoknak fizetett szem\u00e9lyi jelleg\u0171 kifizet\u00e9sek ": {
+						"5511. Betegszabads\u00e1g d\u00edja, munk\u00e1ltat\u00f3t terhel\u0151 t\u00e1pp\u00e9nz, t\u00e1pp\u00e9nz kieg\u00e9sz\u00edt\u00e9s": {}, 
+						"5512. V\u00e9gkiel\u00e9g\u00edt\u00e9s": {}, 
+						"5513. Munk\u00e1baj\u00e1r\u00e1ssal kapcsolatos egy\u00e9b k\u00f6lts\u00e9gek t\u00e9r\u00edt\u00e9se": {}, 
+						"5514. Kik\u00fcldet\u00e9s napid\u00edja": {}, 
+						"5515. Megv\u00e1ltozott munkak\u00e9pess\u00e9g\u0171 munkav\u00e1llal\u00f3k keresetkieg\u00e9sz\u00edt\u00e9se, fizetett seg\u00e9lyek": {}, 
+						"5516. \u00dcd\u00fcl\u00e9si hozz\u00e1j\u00e1rul\u00e1s": {}, 
+						"5517. Lak\u00e1s\u00e9p\u00edt\u00e9sre ny\u00fajtott t\u00e1mogat\u00e1s, alb\u00e9rleti hozz\u00e1j\u00e1rul\u00e1s": {}, 
+						"5518. Jubileumi jutalom, t\u00e1rgyjutalom": {}, 
+						"5519. Sorkatonai vagy polg\u00e1ri szolg\u00e1lat teljes\u00edt\u00e9s\u00e9t k\u00f6vet\u0151en fizetett szem\u00e9lyi alapb\u00e9r": {}
+					}, 
+					"552. J\u00f3l\u00e9ti \u00e9s kultur\u00e1lis k\u00f6lts\u00e9gek": {}, 
+					"559. Egy\u00e9b szem\u00e9lyi jelleg\u0171 kifizet\u00e9sek ": {
+						"5591. Munk\u00e1ltat\u00f3 \u00e1ltal fizetett baleset-, \u00e9let- \u00e9s nyugd\u00edjbiztos\u00edt\u00e1s d\u00edja": {}, 
+						"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": {}, 
+						"5599. Munk\u00e1ltat\u00f3 \u00e1ltal fizetett mag\u00e1nnyugd\u00edj-p\u00e9nzt\u00e1ri tagd\u00edj kieg\u00e9sz\u00edt\u00e9s, munkav\u00e1llal\u00f3kkal kapcsolatos biztos\u00edt\u00e1si d\u00edjak": {}
+					}
+				}, 
+				"56. B\u00c9RJ\u00c1RUL\u00c9KOK": {
+					"561. Nyugd\u00edjbiztos\u00edt\u00e1si \u00e9s eg\u00e9szs\u00e9gbiztos\u00edt\u00e1si j\u00e1rul\u00e9k ": {}, 
+					"562. Eg\u00e9szs\u00e9g\u00fcgyi hozz\u00e1j\u00e1rul\u00e1s": {}, 
+					"563. Munkaad\u00f3i j\u00e1rul\u00e9k": {}, 
+					"564. Szakk\u00e9pz\u00e9si hozz\u00e1j\u00e1rul\u00e1s ": {}, 
+					"569. Egy\u00e9b hozz\u00e1j\u00e1rul\u00e1s ": {}
+				}
+			}, 
+			"57. \u00c9RT\u00c9KCS\u00d6KKEN\u00c9SI LE\u00cdR\u00c1S": {
+				"571. Terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9si le\u00edr\u00e1s ": {
+					"5711. Terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9si le\u00edr\u00e1s ": {
+						"account_type": "Depreciation"
+					}, 
+					"5712. Kiemelt, kis \u00e9rt\u00e9k\u0171 (50 eFt egyedi beszerz\u00e9si \u00e9rt\u00e9k alatti) eszk\u00f6z\u00f6k terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9si le\u00edr\u00e1sa": {}, 
+					"57121. Kis \u00e9rt\u00e9k\u0171 (50 eFt egyedi beszerz\u00e9si \u00e9rt\u00e9k alatti) vagyoni \u00e9rt\u00e9k\u0171 jogok terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9si le\u00edr\u00e1sa": {}, 
+					"57122. Kis \u00e9rt\u00e9k\u0171 (50 eFt egyedi beszerz\u00e9si \u00e9rt\u00e9k alatti) szellemi term\u00e9kek terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9si le\u00edr\u00e1sa": {}, 
+					"57123. Kis \u00e9rt\u00e9k\u0171 (50 eFt egyedi beszerz\u00e9si \u00e9rt\u00e9k alatti) t\u00e1rgyi eszk\u00f6z\u00f6k terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9si le\u00edr\u00e1sa": {}
+				}
+			}, 
+			"58. AKTIV\u00c1LT SAJ\u00c1T TELJES\u00cdTM\u00c9NYEK \u00c9RT\u00c9KE": {
+				"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)": {
+				"is_group": 1
+			}, 
+			"root_type": "Expense"
+		}, 
+		"6. SZ\u00c1MLAOSZT\u00c1LY K\u00d6LTS\u00c9GHELYEK, \u00c1LTAL\u00c1NOS K\u00d6LTS\u00c9GEK": {
+			"61. JAV\u00cdT\u00d3-KARBANTART\u00d3 \u00dcZEMEK K\u00d6LTS\u00c9GEI": {}, 
+			"62. SZOLG\u00c1LTAT\u00c1ST V\u00c9GZ\u00d5 \u00dcZEMEK (EGYS\u00c9GEK) K\u00d6LTS\u00c9GEI": {}, 
+			"63. G\u00c9PK\u00d6LTS\u00c9G": {}, 
+			"64-65. \u00dcZEMI IR\u00c1NY\u00cdT\u00c1S \u00c1LTAL\u00c1NOS K\u00d6LTS\u00c9GEI": {}, 
+			"66. K\u00d6ZPONTI IR\u00c1NY\u00cdT\u00c1S \u00c1LTL\u00c1NOS K\u00d6LTS\u00c9GEI": {}, 
+			"67. \u00c9RT\u00c9KES\u00cdT\u00c9SI, FORGALMAZ\u00c1SI K\u00d6LTS\u00c9GEK": {}, 
+			"68. ELK\u00dcL\u00d6N\u00cdTETT EGY\u00c9B \u00c1LTL\u00c1NOS K\u00d6LTS\u00c9GEK": {
+				"681. Alap\u00edt\u00e1s-\u00e1tszervez\u00e9s k\u00f6lts\u00e9gei": {}, 
+				"682. Alap- \u00e9s alkalmazott kutat\u00e1s saj\u00e1t k\u00f6lts\u00e9gei": {}, 
+				"683. V\u00e1llalkoz\u00e1sban adott alap- \u00e9s alkalmazott kutat\u00e1s k\u00f6lts\u00e9gei": {}, 
+				"684. K\u00eds\u00e9rleti fejleszt\u00e9s saj\u00e1t k\u00f6lts\u00e9gei": {}, 
+				"685. V\u00e1llalkoz\u00e1sba adott k\u00eds\u00e9rleti fejleszt\u00e9s k\u00f6lts\u00e9gei": {}, 
+				"686. Kutat\u00e1s-k\u00eds\u00e9rleti fejleszt\u00e9s \u00e1ltal\u00e1nos \u00e9s k\u00f6zvetett k\u00f6lts\u00e9gei": {}, 
+				"687. Kutat\u00e1s-k\u00eds\u00e9rleti fejleszt\u00e9s elsz\u00e1molt \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {}, 
+				"688. Garanci\u00e1lis jav\u00edt\u00e1s k\u00f6lts\u00e9gei": {}, 
+				"689. Egy\u00e9b elk\u00fcl\u00f6n\u00edtett k\u00f6lts\u00e9gek": {}
+			}, 
+			"69. K\u00d6LTS\u00c9GHELYEK K\u00d6LTS\u00c9GNEMEK \u00c1TVEZET\u00c9SE": {
+				"691. K\u00f6lts\u00e9ghelyek k\u00f6lts\u00e9geinek \u00e1tvezet\u00e9se": {}
+			}, 
+			"root_type": "Expense"
+		}, 
+		"7. SZ\u00c1MLAOSZT\u00c1LY TEV\u00c9KENYS\u00c9GEKK\u00d6LTS\u00c9GEI": {
+			"is_group": 1, 
+			"root_type": "Expense"
+		}, 
+		"8. SZ\u00c1MLAOSZT\u00c1LY \u00c9RT\u00c9KES\u00cdT\u00c9S ELSZ\u00c1MOLT \u00d6NK\u00d6LTS\u00c9GE \u00c9S R\u00c1FORD\u00cdT\u00c1SOK": {
+			"81-83. SZ\u00c1MLACSOPORTOK (az \u00f6sszk\u00f6lts\u00e9g elj\u00e1r\u00e1ssal k\u00e9sz\u00fcl\u0151 eredm\u00e9ny-kimutat\u00e1shoz)": {
+				"81. ANYAGJELLEG\u00db R\u00c1FORD\u00cdT\u00c1SOK": {
+					"811. Anyagk\u00f6lts\u00e9g ": {}, 
+					"812. Ig\u00e9nybe vett szolg\u00e1ltat\u00e1sok \u00e9rt\u00e9ke": {}, 
+					"813. Egy\u00e9b szolg\u00e1ltat\u00e1sok \u00e9rt\u00e9ke": {}, 
+					"814. Eladott \u00e1ruk beszerz\u00e9si \u00e9rt\u00e9ke": {}, 
+					"815. Eladott (k\u00f6zvet\u00edtett) szolg\u00e1ltat\u00e1sok \u00e9rt\u00e9ke": {}
+				}, 
+				"82. SZEM\u00c9LYI JELLEG\u00db R\u00c1FORD\u00cdT\u00c1SOK": {
+					"821. B\u00e9rk\u00f6lts\u00e9g": {}, 
+					"822. Szem\u00e9lyi jelleg\u0171 egy\u00e9b kifizet\u00e9sek": {}, 
+					"823. B\u00e9rj\u00e1rul\u00e9kok": {}
+				}, 
+				"83. \u00c9RT\u00c9KCS\u00d6KKEN\u00c9SI LE\u00cdR\u00c1S": {
+					"831. \u00c9rt\u00e9kcs\u00f6kken\u00e9si le\u00edr\u00e1s ": {}
+				}
+			}, 
+			"81-85. SZ\u00c1MLACSOPORTOK (a forgalmi k\u00f6lts\u00e9g elj\u00e1r\u00e1ssal k\u00e9sz\u00fcl\u0151 eredm\u00e9nykimutat\u00e1shoz)": {
+				"81-82. BELF\u00d6LDI \u00c9RT\u00c9KES\u00cdT\u00c9S K\u00d6ZVETLEN K\u00d6LTS\u00c9GEI": {
+					"811. Belf\u00f6ldi \u00e9rt\u00e9kes\u00edt\u00e9s elsz\u00e1molt k\u00f6zvetlen \u00f6nk\u00f6lts\u00e9ge": {
+						"account_type": "Cost of Goods Sold"
+					}, 
+					"812. Belf\u00f6ldi \u00e9rt\u00e9kes\u00edt\u00e9s eladott \u00e1ruk beszerz\u00e9si \u00e9rt\u00e9ke": {
+						"account_type": "Stock Adjustment"
+					}, 
+					"813. Belf\u00f6ldi \u00e9rt\u00e9kes\u00edt\u00e9s eladott (k\u00f6zvet\u00edtett) szolg\u00e1ltat\u00e1sok \u00e9rt\u00e9ke": {
+						"account_type": "Expenses Included In Valuation"
+					}
+				}, 
+				"83-84. EXPORT\u00c9RT\u00c9KES\u00cdT\u00c9S K\u00d6ZVETLEN K\u00d6LTS\u00c9GEI": {
+					"831. Export\u00e9rt\u00e9kes\u00edt\u00e9s elsz\u00e1molt k\u00f6zvetlen \u00f6nk\u00f6lts\u00e9ge": {}, 
+					"832. Export\u00e9rt\u00e9kes\u00edt\u00e9s eladott \u00e1ruk beszerz\u00e9si \u00e9rt\u00e9ke": {}, 
+					"833. Export\u00e9rt\u00e9kes\u00edt\u00e9s eladott (k\u00f6zvet\u00edtett) szolg\u00e1ltat\u00e1sok \u00e9rt\u00e9ke": {}
+				}, 
+				"85. \u00c9RT\u00c9KES\u00cdT\u00c9S K\u00d6ZVETETT K\u00d6LTS\u00c9GEI": {
+					"851. \u00c9rt\u00e9kes\u00edt\u00e9si, forgalmaz\u00e1si k\u00f6lts\u00e9gek": {}, 
+					"852. Igazgat\u00e1si k\u00f6lts\u00e9gek": {}, 
+					"853. Egy\u00e9b \u00e1ltal\u00e1nos k\u00f6lts\u00e9gek": {}
+				}
+			}, 
+			"86. EGY\u00c9B R\u00c1FORD\u00cdT\u00c1SOK": {
+				"861. Egy\u00e9b r\u00e1ford\u00edt\u00e1snak min\u0151s\u00fcl\u0151 \u00e9rt\u00e9kes\u00edt\u00e9sek": {
+					"8611. \u00c9rt\u00e9kes\u00edtett immateri\u00e1lis javak, t\u00e1rgyi eszk\u00f6z\u00f6k k\u00f6nyv szerinti \u00e9rt\u00e9ke": {}, 
+					"8612. \u00c9rt\u00e9kes\u00edtett, \u00e1truh\u00e1zott (engedm\u00e9nyezett) k\u00f6vetel\u00e9sek k\u00f6nyv szerinti \u00e9rt\u00e9ke": {}
+				}, 
+				"862. Egy\u00e9b r\u00e1ford\u00edt\u00e1snak min\u0151s\u00fcl\u0151 eszk\u00f6z kivezet\u00e9sek": {
+					"8621. Hi\u00e1nyz\u00f3, megsemmis\u00fclt, kiselejtezett immateri\u00e1lis javak, t\u00e1rgyi eszk\u00f6z\u00f6k nett\u00f3 \u00e9rt\u00e9ke": {}, 
+					"8622. Hi\u00e1nyz\u00f3, megsemmis\u00fclt, \u00e1llom\u00e1nyb\u00f3l kivezetett k\u00e9szletek k\u00f6nyv szerinti \u00e9rt\u00e9ke": {}
+				}, 
+				"863. Behajthatatlan k\u00f6vetel\u00e9sek le\u00edrt \u00f6sszege": {}, 
+				"864. C\u00e9ltartal\u00e9k k\u00e9pz\u00e9s": {
+					"8641. C\u00e9ltartal\u00e9k-k\u00e9pz\u00e9s a v\u00e1rhat\u00f3 k\u00f6telezetts\u00e9gekre": {}, 
+					"8642. C\u00e9ltartal\u00e9k-k\u00e9pz\u00e9s a j\u00f6v\u0151beni k\u00f6lts\u00e9gekre": {}, 
+					"8643. C\u00e9ltartal\u00e9k-k\u00e9pz\u00e9s egy\u00e9b c\u00edmen": {}
+				}, 
+				"865. Ut\u00f3lag adott, nem sz\u00e1ml\u00e1zott engedm\u00e9ny": {}, 
+				"866. Egy\u00e9b r\u00e1ford\u00edt\u00e1sk\u00e9nt elsz\u00e1molt ad\u00f3k, illet\u00e9kek, hozz\u00e1j\u00e1rul\u00e1sok": {
+					"8661. K\u00f6zponti k\u00f6lts\u00e9gvet\u00e9ssel elsz\u00e1molt ad\u00f3k, illet\u00e9kek, hozz\u00e1j\u00e1rul\u00e1sok": {}, 
+					"8662. Helyi \u00f6nkorm\u00e1nyzatokkal elsz\u00e1molt ad\u00f3k, illet\u00e9kek, hozz\u00e1j\u00e1rul\u00e1sok": {}, 
+					"8663. Elk\u00fcl\u00f6n\u00edtett \u00e1llami p\u00e9nzalapokkal elsz\u00e1molt ad\u00f3k, illet\u00e9kek, hozz\u00e1j\u00e1rul\u00e1sok": {}, 
+					"8664. T\u00e1rsadalombiztos\u00edt\u00e1ssal elsz\u00e1molt ad\u00f3k, illet\u00e9kek, hozz\u00e1j\u00e1rul\u00e1sok": {}, 
+					"8665. EU p\u00e9nz\u00fcgyi alapokkal elsz\u00e1molt ad\u00f3k, illet\u00e9kek, hozz\u00e1j\u00e1rul\u00e1sok": {}, 
+					"8666. R\u00e1ford\u00edt\u00e1sk\u00e9nt elsz\u00e1molt egy\u00e9b ad\u00f3k \u00e9s ad\u00f3jelleg\u0171 t\u00e9telek": {}
+				}, 
+				"867. Egy\u00e9b r\u00e1ford\u00edt\u00e1sk\u00e9nt elsz\u00e1molt, ad\u00f3nak nem min\u0151s\u00fcl\u0151 kifizet\u00e9sek": {
+					"8671. K\u00e1resem\u00e9nnyel kapcsolatos fizetett, fizetend\u0151 \u00f6sszegek": {}, 
+					"8672. K\u00f6lts\u00e9gek (r\u00e1ford\u00edt\u00e1sok) ellent\u00e9telez\u00e9s\u00e9re visszafizet\u00e9si k\u00f6telezetts\u00e9g n\u00e9lk\u00fcl adott t\u00e1mogat\u00e1s, juttat\u00e1": {}, 
+					"8673. Fejleszt\u00e9si c\u00e9lra, visszafizet\u00e9si k\u00f6telezetts\u00e9g n\u00e9lk\u00fcl adott t\u00e1mogat\u00e1s, juttat\u00e1s": {}, 
+					"8674. Fejleszt\u00e9si c\u00e9lra kapott t\u00e1mogat\u00e1s visszafizetend\u0151 \u00f6sszege": {}, 
+					"8675. Tao \u00e1ltal elismert b\u00edrs\u00e1gok, k\u00f6tb\u00e9rek, k\u00e9sedelmi kamatok, p\u00f3tl\u00e9kok, k\u00e1rt\u00e9r\u00edt\u00e9sek, s\u00e9relemd\u00edjak": {}, 
+					"8676. Tao \u00e1ltal el nem ismert b\u00edrs\u00e1gok, k\u00f6tb\u00e9rek, k\u00e9sedelmi kamatok, p\u00f3tl\u00e9kok, k\u00e1rt\u00e9r\u00edt\u00e9sek, s\u00e9relemd\u00edjak": {}
+				}, 
+				"868. Terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9sek, \u00e9rt\u00e9kveszt\u00e9sek": {
+					"8681. Immateri\u00e1lis javak terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {}, 
+					"8682. T\u00e1rgyi eszk\u00f6z\u00f6k terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {}, 
+					"8683. K\u00e9szletek \u00e9rt\u00e9kveszt\u00e9se": {}, 
+					"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": {}, 
+					"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": {}, 
+					"8695. Elengedett k\u00f6vetel\u00e9sek k\u00f6nyv szerinti \u00e9rt\u00e9ke": {}, 
+					"8696. Egy\u00e9b, vagyoncs\u00f6kken\u00e9ssel j\u00e1r\u00f3 r\u00e1ford\u00edt\u00e1sok": {}
+				}
+			}, 
+			"87. P\u00c9NZ\u00dcGYI M\u0170VELETEK R\u00c1FORD\u00cdT\u00c1SAI": {
+				"871. R\u00e9szesed\u00e9sekb\u0151l sz\u00e1rmaz\u00f3 r\u00e1ford\u00edt\u00e1sok, \u00e1rfolyamvesztes\u00e9gek": {}, 
+				"872. Befektetett p\u00e9nz\u00fcgyi eszk\u00f6z\u00f6kb\u0151l (\u00e9rt\u00e9kpap\u00edrokb\u00f3l, k\u00f6lcs\u00f6n\u00f6kb\u0151l) sz\u00e1rmaz\u00f3 r\u00e1ford\u00edt\u00e1sok \u00e1rfolyamvesztes\u00e9gek": {}, 
+				"873. Hitelint\u00e9zetnek fizetend\u0151 kamatok \u00e9s kamatjelleg\u0171 r\u00e1ford\u00edt\u00e1sok": {}, 
+				"874. Nem hitelint\u00e9zetnek fizetend\u0151 kamatok \u00e9s kamatjelleg\u0171 r\u00e1ford\u00edt\u00e1sok": {}, 
+				"875. R\u00e9szesed\u00e9sek, \u00e9rt\u00e9kpap\u00edrok, bankbet\u00e9tek \u00e9rt\u00e9kveszt\u00e9se \u00e9s vissza\u00edr\u00e1sa": {
+					"8751. R\u00e9szesed\u00e9sek, \u00e9rt\u00e9kpap\u00edrok, bankbet\u00e9tek \u00e9rt\u00e9kveszt\u00e9se": {}, 
+					"8752. R\u00e9szesed\u00e9sek, \u00e9rt\u00e9kpap\u00edrok, bankbet\u00e9tek \u00e9rt\u00e9kveszt\u00e9s\u00e9nek vissza\u00edr\u00e1sa": {}
+				}, 
+				"876. K\u00fclf\u00f6ldi p\u00e9nz\u00e9rt\u00e9kre sz\u00f3l\u00f3 eszk\u00f6z\u00f6k \u00e9s k\u00f6telezetts\u00e9gek \u00e1rfolyamvesztes\u00e9gei": {
+					"8761. Deviza- \u00e9s valutak\u00e9szletek forintra \u00e1tv\u00e1lt\u00e1s\u00e1nak \u00e1rfolyamvesztes\u00e9ge": {}, 
+					"8762. K\u00fclf\u00f6ldi p\u00e9nz\u00e9rt\u00e9kre sz\u00f3l\u00f3 eszk\u00f6z\u00f6k \u00e9s k\u00f6telezetts\u00e9gek p\u00e9nz\u00fcgyileg rendezett \u00e1rfolyamvesztes\u00e9ge": {}
+				}, 
+				"877. P\u00e9nz\u00fcgyi m\u0171veletek egy\u00e9b r\u00e1ford\u00edt\u00e1sai": {}, 
+				"878. P\u00e9nz\u00fcgyi rendez\u00e9shez kapcsol\u00f3d\u00f3an adott engedm\u00e9ny": {}, 
+				"879. Egy\u00e9b vagyoncs\u00f6kken\u00e9ssel j\u00e1r\u00f3 p\u00e9nz\u00fcgyi r\u00e1ford\u00edt\u00e1sok": {}
+			}, 
+			"88. RENDK\u00cdV\u00dcLI R\u00c1FORD\u00cdT\u00c1SOK": {
+				"881. T\u00e1rsas\u00e1gba bevitt eszk\u00f6z\u00f6k nyilv\u00e1ntart\u00e1s szerinti \u00e9rt\u00e9ke": {}
+			}, 
+			"89. EREDM\u00c9NYT TERHEL\u0150 AD\u00d3K": {
+				"891. T\u00e1rsas\u00e1gi ad\u00f3": {}, 
+				"892. Egyszer\u0171s\u00edtett v\u00e1llalkoz\u00f3i ad\u00f3": {}, 
+				"893. Kisv\u00e1llalati ad\u00f3": {}, 
+				"899. Eredm\u00e9nyt terhel\u0151 egy\u00e9b ad\u00f3k": {}
+			}, 
+			"root_type": "Expense"
+		}, 
+		"9. SZ\u00c1MLAOSZT\u00c1LY BEV\u00c9TELEK": {
+			"91. BELF\u00d6LDI \u00c9RT\u00c9KES\u00cdT\u00c9S \u00c1RBEV\u00c9TELE": {
+				"911. Belf\u00f6ldinek \u00e9rt\u00e9kes\u00edtett saj\u00e1t termel\u00e9s\u0171 k\u00e9szletek \u00e1rbev\u00e9tele": {}, 
+				"912. Belf\u00f6ldinek \u00e9rt\u00e9kes\u00edtett v\u00e1s\u00e1rolt k\u00e9szletek \u00e1rbev\u00e9tele": {}, 
+				"913. Belf\u00f6ldinek ny\u00fajtott szolg\u00e1ltat\u00e1sok \u00e1rbev\u00e9tele": {}, 
+				"918. Belf\u00f6ldi \u00e9rt\u00e9kes\u00edt\u00e9ssel kapcsolatos \u00e1rt\u00e1mogat\u00e1s": {}, 
+				"919. Egy\u00e9b belf\u00f6ldi \u00e9rt\u00e9kes\u00edt\u00e9s \u00e1rbev\u00e9tele": {}
+			}, 
+			"92. EXPORT\u00c9RT\u00c9KES\u00cdT\u00c9S \u00c1RBEV\u00c9TELE": {
+				"921. K\u00fclf\u00f6ldinek \u00e9rt\u00e9kes\u00edtett saj\u00e1t termel\u00e9s\u0171 k\u00e9szletek \u00e1rbev\u00e9tele": {}, 
+				"922. K\u00fclf\u00f6ldinek \u00e9rt\u00e9kes\u00edtett v\u00e1s\u00e1rolt k\u00e9szletek \u00e1rbev\u00e9tele": {}, 
+				"923. K\u00fclf\u00f6ldinek ny\u00fajtott szolg\u00e1ltat\u00e1sok \u00e1rbev\u00e9tele": {}, 
+				"928. K\u00fclf\u00f6ldi \u00e9rt\u00e9kes\u00edt\u00e9ssel kapcsolatos \u00e1rt\u00e1mogat\u00e1s": {}, 
+				"929. Egy\u00e9b k\u00fclf\u00f6ldi \u00e9rt\u00e9kes\u00edt\u00e9s \u00e1rbev\u00e9tele": {}
+			}, 
+			"96. EGY\u00c9B BEV\u00c9TELEK": {
+				"961. Egy\u00e9b bev\u00e9telnek min\u0151s\u00fcl\u0151 \u00e9rt\u00e9kes\u00edt\u00e9sek": {
+					"9611. \u00c9rt\u00e9kes\u00edtett immateri\u00e1lis javak, t\u00e1rgyi eszk\u00f6z\u00f6k ellen\u00e9rt\u00e9ke": {}, 
+					"9612. \u00c9rt\u00e9kes\u00edtett, \u00e1truh\u00e1zott (engedm\u00e9nyezett) k\u00f6vetel\u00e9sek ellen\u00e9rt\u00e9ke": {}
+				}, 
+				"963. K\u00f6vetel\u00e9s k\u00f6nyv szerinti \u00e9rt\u00e9k\u00e9t meghalad\u00f3an realiz\u00e1lt \u00f6sszeg": {}, 
+				"964. C\u00e9ltartal\u00e9k felold\u00e1s": {
+					"9651. V\u00e1rhat\u00f3 k\u00f6telezetts\u00e9gek fedezet\u00e9re k\u00e9pzett  c\u00e9ltartal\u00e9k felhaszn\u00e1l\u00e1sa   ": {}, 
+					"9652. J\u00f6v\u0151beni k\u00f6lts\u00e9gekre k\u00e9pzett c\u00e9ltartal\u00e9k felhaszn\u00e1l\u00e1sa ": {}, 
+					"9653. Egy\u00e9b c\u00edmen k\u00e9pzett c\u00e9ltartal\u00e9k felhaszn\u00e1l\u00e1sa ": {}
+				}, 
+				"965. Ut\u00f3lag kapott, nem sz\u00e1ml\u00e1zott engedm\u00e9ny": {}, 
+				"966. Ut\u00f3lag kapott, nem sz\u00e1ml\u00e1zott engedm\u00e9ny": {
+					"9661. K\u00f6zponti k\u00f6lts\u00e9gvet\u00e9sb\u0151l kapott t\u00e1mogat\u00e1s, juttat\u00e1s": {}, 
+					"9662. Helyi \u00f6nkorm\u00e1nyzatokt\u00f3l kapott t\u00e1mogat\u00e1s, juttat\u00e1s": {}, 
+					"9663. Eur\u00f3pai Uni\u00f3t\u00f3l kapott t\u00e1mogat\u00e1s, juttat\u00e1s": {}, 
+					"9664. Egy\u00e9b forr\u00e1sb\u00f3l kapott t\u00e1mogat\u00e1s, juttat\u00e1s": {}
+				}, 
+				"967. Egy\u00e9b bev\u00e9telk\u00e9nt elsz\u00e1molt p\u00e9nzbev\u00e9telek": {
+					"9671. K\u00e1resem\u00e9nnyel kapcsolatos t\u00e9r\u00edt\u00e9sek": {}, 
+					"9672. K\u00f6lts\u00e9gek (r\u00e1ford\u00edt\u00e1sok) ellent\u00e9telez\u00e9s\u00e9re kapott t\u00e1mogat\u00e1s, juttat\u00e1s": {}, 
+					"9673. Fejleszt\u00e9si c\u00e9lra kapott t\u00e1mogat\u00e1s, juttat\u00e1s": {}, 
+					"9674. Kapott b\u00edrs\u00e1gok, k\u00f6tb\u00e9rek, fekb\u00e9rek, k\u00e9sedelmi kamatok, k\u00e1rt\u00e9r\u00edt\u00e9sek": {}
+				}, 
+				"968. Terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9sek, \u00e9rt\u00e9kveszt\u00e9sek vissza\u00edr\u00e1sa": {
+					"9681. Immateri\u00e1lis javak terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9s\u00e9nek vissza\u00edr\u00e1sa": {}, 
+					"9682. T\u00e1rgyi eszk\u00f6z\u00f6k terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9s\u00e9nek vissza\u00edr\u00e1sa": {}, 
+					"9683. K\u00e9szletek \u00e9rt\u00e9kveszt\u00e9s\u00e9nek vissza\u00edr\u00e1sa": {}, 
+					"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": {}
+				}
+			}, 
+			"97. P\u00c9NZ\u00dcGYI M\u0170VELETEK BEV\u00c9TELEI": {
+				"971. R\u00e9szesed\u00e9sekb\u0151l sz\u00e1rmaz\u00f3 bev\u00e9telek, \u00e1rfolyamnyeres\u00e9gek": {}, 
+				"972. Befektetett p\u00e9nz\u00fcgyi eszk\u00f6z\u00f6kb\u0151l (\u00e9rt\u00e9kpap\u00edrokb\u00f3l, k\u00f6lcs\u00f6n\u00f6kb\u0151l) sz\u00e1rmaz\u00f3 bev\u00e9telek, \u00e1rfolyamnyeres\u00e9gek": {}, 
+				"973. Hitelint\u00e9zett\u0151l kapott kamatok \u00e9s kamatjelleg\u0171 bev\u00e9telek": {}, 
+				"974. Nem hitelint\u00e9zett\u0151l kapott kamatok \u00e9s kamatjelleg\u0171 bev\u00e9telek": {}, 
+				"975. Kapott (j\u00e1r\u00f3) osztal\u00e9k \u00e9s r\u00e9szesed\u00e9s": {}, 
+				"976. K\u00fclf\u00f6ldi p\u00e9nz\u00e9rt\u00e9kre sz\u00f3l\u00f3 eszk\u00f6z\u00f6k \u00e9s k\u00f6telezetts\u00e9gek \u00e1rfolyamnyeres\u00e9gei": {
+					"9761. Deviza- \u00e9s valutak\u00e9szletek forintra \u00e1tv\u00e1lt\u00e1s\u00e1nak \u00e1rfolyamnyeres\u00e9ge": {}, 
+					"9762. K\u00fclf\u00f6ldi p\u00e9nz\u00e9rt\u00e9kre sz\u00f3l\u00f3 eszk\u00f6z\u00f6k \u00e9s k\u00f6telezetts\u00e9gek p\u00e9nz\u00fcgyileg rendezett \u00e1rfolyamnyeres\u00e9ge": {}
+				}, 
+				"977. P\u00e9nz\u00fcgyi m\u0171veletek egy\u00e9b bev\u00e9telei": {}, 
+				"978. P\u00e9nz\u00fcgyi rendez\u00e9shez kapcsol\u00f3d\u00f3an kapott engedm\u00e9ny": {}, 
+				"979. Egy\u00e9b vagyonn\u00f6veked\u00e9ssel j\u00e1r\u00f3 p\u00e9nz\u00fcgyi bev\u00e9telek": {}
+			}, 
+			"root_type": "Income"
+		}
+	}
+}

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

@@ -0,0 +1,359 @@
+{
+    "country_code": "id", 
+    "name": "Indonesia - Chart of Accounts", 
+    "tree": {
+        "1000.0000 Aktiva": {
+            "1100.0000 Aktiva Lancar": {
+                "1110.0000 Kas": {
+                    "1111.000 Kas Rupiah": {
+                        "1111.0010 Kas Kecil": {
+                            "account_type": "Cash"
+                        }, 
+                        "1111.0020 Kas Besar": {
+                            "account_type": "Cash"
+                        }, 
+                        "account_type": "Cash"
+                    }, 
+                    "1112.000 Kas Mata Uang Lain": {
+                        "1112.0010 Kas USD": {
+                            "account_type": "Cash"
+                        }
+                    }
+                }, 
+                "1120.000 Bank ": {
+                    "1121.000 Bank Rupiah": {
+						"is_group": 1
+                    }, 
+                    "1122.000 Bank Other Currency": {
+						"is_group": 1
+                    }, 
+                    "account_type": "Bank"
+                }, 
+                "1130.000 Piutang": {
+                    "1131.000 Piutang Dagang": {
+                        "1131.0010 Piutang Dagang": {
+                            "account_type": "Receivable"
+                        }
+                    }, 
+                    "1132.000 Piutang Lain lain": {
+                        "1132.001 Piutang Lain-lain 1": {
+                            "account_type": "Receivable"
+                        }
+                    }
+                }, 
+                "1140.000 Persediaan Barang": {
+                    "1141.000 Persediaan Barang": {
+                        "account_type": "Stock", 
+                        "is_group": 1
+                    }, 
+                    "1142.000 Uang Muka Pembelian": {
+                        "1142.001 Uang Muka Pembelian": {
+                            "account_type": "Bank"
+                        }
+                    }
+                }, 
+                "1150.000 Biaya di Bayar di Muka": {
+                    "1151.000 Biaya di Bayar di Muka": {
+                        "1151.001 Biaya di Bayar di Muka": {
+                            "1151.00111 Biaya d Bayar di Muka": {}
+                        }
+                    }
+                }, 
+                "1160.000 Pendapatan Yang Akan di Terima": {
+                    "1161.000 Pendapatan Yang di Terima": {
+                        "1161.001 Pendapatan Yang Akan di Terima": {}
+                    }
+                }, 
+                "1170.000 Akun sementara": {
+                    "1171.000 Pembukaan sementara": {
+                        "account_type": "Temporary"
+                    }
+                }
+            }, 
+            "1200.000 Aktiva Tetap": {
+                "1210.000 Aktiva": {
+                    "1211.000 Aktiva": {
+                        "1211.001 Aktiva": {
+                            "account_type": "Fixed Asset"
+                        }
+                    }, 
+                    "1212.000 Akumulasi Penyusutan Aktiva": {
+                        "1212.001 Akumulasi Penyusutan Aktiva": {
+                            "account_type": "Accumulated Depreciation"
+                        }
+                    }
+                }, 
+                "1230.000 Investasi": {
+                    "1231.000 Investasi": {
+                        "1231.001 Investai Saham": {
+                            "1231.0011 Investasi Saham": {}
+                        }, 
+                        "1231.002 Investasi Perumahan": {
+                            "1231.0021 Investasi Perumahan": {}
+                        }, 
+                        "1231.003 Deposito": {
+                            "is_group": 1
+                        }
+                    }
+                }
+            }, 
+            "root_type": "Asset"
+        }, 
+        "2000.000 Passiva": {
+            "2100.000 Pasiva Lancar": {
+                "2110.000 Hutang Dagang": {
+                    "2111.000 Hutang Dagang Rupiah": {
+                        "2111.001 Hutang Dagang Dalam Negeri": {
+                            "account_type": "Payable"
+                        }, 
+                        "2111.002 Hutang Dagang Luar Negeri": {
+                            "account_type": "Payable"
+                        }, 
+                        "2111.003 Hutang Dagang Biaya Kirim Dalam Negeri": {
+                            "account_type": "Payable"
+                        }, 
+                        "2111.004 HUtang Dagang Biaya Kirim Luar Negeri": {
+                            "account_type": "Payable"
+                        }
+                    }, 
+                    "2112.000 Hutang Dagang Other Currency": {
+                        "2112.001 Hutang Dagang Luar Negeri (USD)": {
+                            "account_type": "Payable"
+                        }, 
+                        "2112.002 Hutang Dagang Luar Negeri (SGD)": {
+                            "account_type": "Payable"
+                        }, 
+                        "2112.003 Hutang Dagang Biaya Kirim Luar Negeri (USD)": {
+                            "account_type": "Payable"
+                        }, 
+                        "2112.004 Hutang Dagang Biaya Kirim Luar Negeri (SGD)": {
+                            "account_type": "Payable"
+                        }, 
+                        "2112.005 Hutang Dagang Biaya Kirim Dalam Negeri": {
+                            "account_type": "Payable"
+                        }
+                    }, 
+                    "2115.000 Stock Diterima Tapi Tidak Ditagih": {
+                        "account_type": "Stock Received But Not Billed"
+                    }
+                }, 
+                "2120.000 Pendapatan di Terima di Muka": {
+                    "2121.000 Pendapatan di Terima di Muka": {
+                        "2121.001 Dp Penjualan": {
+                            "account_type": "Bank"
+                        }
+                    }
+                }, 
+                "2130.000 Biaya Yang Akan di Bayar": {
+                    "2131.000 Biaya Yang Akan di Bayar": {
+                        "2131.001 Biaya Yang Akan di Bayar": {}
+                    }, 
+                    "2132.000 Biaya Yang Akan di Bayar - Freight": {
+                        "2132.001 Biaya Yang Akan di Bayar - Freight": {
+                            "account_type": "Expenses Included In Valuation"
+                        }
+                    }
+                }, 
+                "2140.000 Hutang Pajak": {
+                    "2141.000 Hutang Pajak": {
+                        "account_type": "Payable"
+                    }
+                }
+            }, 
+            "2200.000 Passiva Tetap": {
+                "2210.000 Hutang Pada Pihak ke 3": {
+                    "2211.000 Pinjaman Pihak ke 3 Rutin": {
+                        "2211.001 Hutang": {}
+                    }, 
+                    "2212.000 Pinjaman Pihak ke 3 Tidak Rutin": {
+                        "2212.001 Hutang": {}
+                    }, 
+                    "2213.000 Hutang Bunga Pinjaman Pihak Ke 3 Tidak Rutin": {
+                        "2213.001 Hutang Bunga": {}
+                    }
+                }, 
+                "2220.000 Hutang Pada Bank": {
+                    "2221.000 Hutang Bank": {
+                        "2221.001 Hutang": {}
+                    }
+                }, 
+                "2230.000 Hutang Leasing Kendaraan": {
+                    "2231.000 Hutang Leasing Kendaraan": {
+                        "2231.001 Hutang Leasing Kendaraan": {}
+                    }
+                }, 
+                "2240.000 Hutang Lain Lain": {
+                    "2241.000 Hutang Lain Lain": {
+                        "2241.001 Hutang": {}
+                    }
+                }
+            }, 
+            "root_type": "Liability"
+        }, 
+        "3000.000 Modal": {
+            "3100.000 Modal": {
+                "3110.000 Modal di Setor": {}, 
+                "3120.000 Prive P.Saham": {}, 
+                "3130.000 Saldo pembukaan Equity": {}
+            }, 
+            "3200.000 Laba": {
+                "3210.000 Laba di Tahan": {}, 
+                "3220.000 Laba Tahun Berjalan": {}, 
+                "3230.000 Laba Periode Berjalan": {}
+            }, 
+            "root_type": "Equity"
+        }, 
+        "4000.000 Penjualan": {
+            "4100.000 Penjualan Barang Dagangan": {
+                "4110.000 Penjualan": {}, 
+                "4120.000 Retur Penjualan": {}, 
+                "4130.000 Potongan Penjualan": {}
+            }, 
+            "4200.000 Harga Pokok Pembelian": {
+                "4210.000 HPP Pembelian": {
+                    "account_type": "Cost of Goods Sold"
+                }
+            }, 
+            "4300.000 Pendapatan Service/Jasa": {
+                "4310.000 Pendapatan Service": {}
+            }, 
+            "4400.000 Pendapatan Lain lain": {
+                "4410.000 Pendapatan Bunga Bank": {}, 
+                "4420.000 Pendapatan Bunga Dari Pihak Ke 3": {}, 
+                "4430.000 Pendapatan Keuntungan Penjualan Aktiva": {}, 
+                "4440.000 Pendapatan Komisi": {}, 
+                "4450.000 Pendapatan Sewa Gudang": {}, 
+                "4460.000 Pendapatan Sewa Lain lain": {}, 
+                "4470.000 Pendapatan Penjualan Barang BS": {}, 
+                "4480.000 Pendapatan Lain lain": {}
+            }, 
+            "root_type": "Income"
+        }, 
+        "5000.000 Beban": {
+            "5100.000 Beban Langsung": {
+                "5110.000 Beban Penjualan": {
+                    "5110.001 Biaya BBM": {}, 
+                    "5110.002 Biaya Tol": {}, 
+                    "5110.003 Biaya Parkir": {}, 
+                    "5110.004 Biaya Upah Angkat/Turun Barang": {}, 
+                    "5110.005 Biaya Kuli": {}, 
+                    "5110.006 Biaya Perjalanan Dinas": {}, 
+                    "5110.007 Biaya Barang Rusak": {}, 
+                    "5110.008 Biaya Perbaikan Kendaraan Operasional": {}, 
+                    "5110.009 Biaya Asuransi Kendaraan Operasional": {}, 
+                    "5110.010 Biaya Leasing Kendaraan Operasional": {}, 
+                    "5110.011 Biaya Kebutuhan Penjualan": {}, 
+                    "5110.012 Biaya Sample": {}, 
+                    "5110.013 Biaya Bonus, Hadiah, dan Sampel": {}, 
+                    "5110.014 Biaya Entertainment dan Pergaulan": {}, 
+                    "5110.015 Biaya Sewa Gudang": {}, 
+                    "5110.016 Biaya Sewa Peralatan Gudang": {}, 
+                    "5110.017 Biaya Piutang Tak Tertagih": {}, 
+                    "5110.018 Potongan Supplier": {}, 
+                    "5110.019 Biaya Penjualan Lain Lain": {}, 
+                    "5110.020 Penyesuaian Stock": {
+                        "account_type": "Stock Adjustment"
+                    }, 
+                    "5110.021 Biaya Susut Barang": {}
+                }, 
+                "5120.000 Biaya Gaji & Kesejahteraan Pegawai": {
+                    "5120.001 Biaya Gaji Staff & Karyawan Tetap": {}, 
+                    "5120.002 Biaya Gaji Karyawan Harian": {}, 
+                    "5120.003 Biaya Pengobatan": {}, 
+                    "5120.004 Biaya Asuransi Kesehatan Pegawai": {}, 
+                    "5120.005 Biaya THR, Bonus, dan Komisi": {}, 
+                    "5120.006 Biaya Konsumsi": {}, 
+                    "5120.007 Biaya Gaji & Kesejahteraan Lainnya": {}
+                }, 
+                "5130.000 Biaya Kantor & Gudang": {
+                    "5130.001 Biaya PLN Gudang & Kantor": {}, 
+                    "5130.002 Biaya PAM Gudang & Kantor": {}, 
+                    "5130.003 Biaya TLP Gudang & Kantor": {}, 
+                    "5130.004 Biaya Fotocopy, Photo, Print Out": {}, 
+                    "5130.005 Biaya Alat Tulis Kantor": {}, 
+                    "5130.006 Biaya Stamp Duty & Pos": {}, 
+                    "5130.007 Biaya Servis Peralatan Gudang": {}, 
+                    "5130.008 Biaya Pemeliharaan Bgn Gudang": {}, 
+                    "5130.009 Biaya Humas & Pergaulan": {}, 
+                    "5130.010 Biaya Perlengkapan Gudang": {}, 
+                    "5130.011 Iuran Bulanan": {}, 
+                    "5130.012 Biaya Serba Serbi": {}, 
+                    "5130.013 Biaya Sewa Kantor": {}, 
+                    "5130.014 Biaya Asuransi Bangunan": {}, 
+                    "5130.015 Biaya Sumbangan": {}, 
+                    "5130.016 Biaya Perizinan Usaha dan Bangunan": {}, 
+                    "5130.017 Biaya Perizinan Kendaraan Operasional": {}, 
+                    "5130.018 Biaya KTR & GDG Lain Lain": {}
+                }
+            }, 
+            "5200.000 Beban Tidak Langsung": {
+                "5210.000 Biaya Gaji & Kesejahteraan Pegawai Indirect": {
+                    "5210.001 Biaya Gaji Staff": {}, 
+                    "5210.002 Biaya THR dan Bonus Staff": {}, 
+                    "5210.003 Biaya Pengobatan & Kesehatan": {}, 
+                    "5210.004 Biaya Konsumsi": {}, 
+                    "5210.005 Biaya Gaji Lain Lain": {}
+                }, 
+                "5220.000 Biaya Operational Indirect": {
+                    "5220.001 Biaya BBM": {}, 
+                    "5220.002 Biaya Tol & Parkir": {}, 
+                    "5220.003 Biaya TLP & HP": {}, 
+                    "5220.004 Biaya Perjalanan Dinas": {}, 
+                    "5220.005 Biaya Perbaikan Kendaraan Dinas": {}, 
+                    "5220.006 Biaya Asuransi Kendaraan Dinas": {}, 
+                    "5220.007 Biaya Leasing Kendaraan Dinas": {}, 
+                    "5220.008 Biaya Entertainment dan Pergaulan": {}, 
+                    "5220.009 Biaya Hadiah dan Bonus": {}
+                }, 
+                "5230.000 Biaya Kantor Indirect": {
+                    "5230.001 Biaya PLN Kantor": {}, 
+                    "5230.002 Biaya PAM Kantor": {}, 
+                    "5230.003 Biaya TLP Kantor": {}, 
+                    "5230.004 Biaya Sewa Kantor": {}, 
+                    "5230.005 Biaya Asuransi Bangunan": {}, 
+                    "5230.006 Biaya Alat Tulis Kantor": {}, 
+                    "5230.007 Biaya Fotocopy, Photo, Print Out": {}, 
+                    "5230.008 Biaya Kirim Dokumen": {}, 
+                    "5230.009 Biaya Perlengkapan & Peralatan Kantor": {}, 
+                    "5230.010 Service Peralatan Kantor": {}, 
+                    "5230.011 Biaya Pemeliharaan Bangunan Kantor": {}, 
+                    "5230.012 Biaya Iuran Bulanan": {}, 
+                    "5230.013 Biaya Sumbangan": {}, 
+                    "5230.014 Biaya Perizinan Bangunan": {}, 
+                    "5230.015 Biaya Perizinan Kendaraan Dinas": {}, 
+                    "5230.016 Biaya KTR Lain Lain": {}, 
+                    "5230.017 Biaya Stamp Duty & Pos": {}
+                }
+            }, 
+            "5300.000 Biaya Penyusutan": {
+                "5310.000 Biaya Penyusutan": {
+                    "5310.001 By Peny Aktiva ": {
+                        "account_type": "Depreciation"
+                    }
+                }
+            }, 
+            "5400.000 Biaya Amortisasi": {
+                "5410.000 Biaya Amortisasi": {}
+            }, 
+            "5500.000 Beban Lain lain": {
+                "5510.000 Beban Lain lain": {
+                    "5510.001 Beban Adm Bank": {}, 
+                    "5510.002 Beban Provisi Pinjaman Bank": {}, 
+                    "5510.003 Beban Notaris Dan ADM Kredit Bank": {}, 
+                    "5510.004 Beban Bunga Kredit Rekening Koran Bank": {}, 
+                    "5510.005 Beban Bunga Pinjaman Pada Pihak Ke 3": {}, 
+                    "5510.006 Beban Pajak Bumi & Bangunan": {}, 
+                    "5510.007 Beban Pajak Penghasilan ": {}, 
+                    "5510.008 Beban Pajak PPN": {}, 
+                    "5510.009 Selisih Pembayaran Customer": {
+                        "account_type": "Round Off"
+                    }, 
+                    "5510.010 Selisih Kurs": {
+                        "account_type": "Round Off"
+                    }
+                }
+            }, 
+            "root_type": "Expense"
+        }
+    }
+}

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

@@ -26,8 +26,9 @@
 	                "Earnest Money": {}
 	            },
 	            "Stock Assets": {
-	                "account_type": "Stock",
-					"is_group": 1
+					"Stock in Hand": {
+		                "account_type": "Stock"							
+					}
 	            },
 	            "Tax Assets": {
 					"is_group": 1
@@ -136,7 +137,8 @@
 			    "Accounts Payable": {
 			        "Creditors": {
 			            "account_type": "Payable"
-			        }
+			        },
+					"Payroll Payable": {}
 			    },
 			    "Stock Liabilities": {
 				    "Stock Received But Not Billed": {

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

@@ -5,15 +5,15 @@
         "ACTIVO": {
             "ACTIVO CIRCULANTE": {
                 "DOCUMENTOS Y CUENTAS  POR COBRAR": {
-                    "COMPA\u00d1IAS AFILIADAS Y RELACIONADAS": {}, 
+                    "COMPA\u00d1IAS AFILIADAS Y RELACIONADAS 1": {}, 
                     "CUENTAS POR COBRAR ACCIONISTAS": {
-                        "CUENTAS POR COBRAR SOCIOS": {
+                        "CUENTAS POR COBRAR SOCIOS 1": {
                             "account_type": "Receivable"
                         }
                     }, 
                     "CUENTAS POR COBRAR EMPLEADOS": {
                         "ANTICIPO DE NOMINA": {}, 
-                        "CUENTAS POR COBRAR EMPLEADOS": {
+                        "CUENTAS POR COBRAR EMPLEADOS 1": {
                             "account_type": "Receivable"
                         }, 
                         "CUENTAS POR COBRAR SOCIOS": {
@@ -21,8 +21,8 @@
                         }, 
                         "PRESTAMOS PERSONALES": {}, 
                         "SEGURO DE VEHICULOS": {}, 
-                        "UTILIDADES": {}, 
-                        "VACACIONES": {}, 
+                        "UTILIDADES 1": {}, 
+                        "VACACIONES 1": {}, 
                         "VIATICOS VENDEDORES": {}
                     }, 
                     "CUENTAS POR COBRAR EXTERIOR": {}, 
@@ -41,10 +41,11 @@
                     "EFECTOS POR COBRAR": {
                         "EFECTOS POR COBRAR NACIONALES": {
                             "account_type": "Receivable"
-                        }
+                        }, 
+                        "account_type": "Receivable"
                     }, 
                     "INTERESES POR COBRAR": {}, 
-                    "OTRAS CUENTAS POR COBRAR": {
+                    "OTRAS CUENTAS POR COBRAR 1": {
                         "ADELANTO A PROVEEDORES": {}, 
                         "CHEQUES DEVUELTOS": {}, 
                         "DEPOSITOS VARIOS": {}, 
@@ -67,23 +68,29 @@
                     }, 
                     "BANCOS E INTITUCIONES FINANCIERAS": {
                         "BANCO X MXN": {}, 
-                        "BANCO X USD": {}
+                        "BANCO X USD": {}, 
+                        "account_type": "Bank"
                     }, 
                     "CAJAS": {
-                        "CAJA CHICA": {}, 
-                        "CAJA PRINCIPAL": {}, 
-                        "FONDO A DEPOSITAR": {}
+                        "CAJA CHICA": {
+                            "account_type": "Cash"
+                        }, 
+                        "CAJA PRINCIPAL": {
+                            "account_type": "Cash"
+                        }, 
+                        "FONDO A DEPOSITAR": {}, 
+                        "account_type": "Cash"
                     }, 
                     "INVERSIONES A CORTO PLAZO": {
                         "INVERSIONES EN BONOS M.E.": {}, 
-                        "INVERSIONES EN BONOS M.N.": {}, 
+                        "INVERSIONES EN BONOS M.N. 1": {}, 
                         "INVERSIONES TEMPORALES": {}, 
                         "PAPELES COMERCIALES": {}
                     }
                 }, 
                 "GASTOS OPERACIONALES": {
                     "GASTOS PREPAGADOS OPERATIVOS": {
-                        "ALQUILERES": {}, 
+                        "ALQUILERES 1": {}, 
                         "PUBLICIDAD": {}, 
                         "SEGURO PREPAGADOS": {}
                     }
@@ -102,40 +109,50 @@
                     }
                 }, 
                 "INVENTARIOS": {
-                    "INVENTARIO EN TRANSITO": {
-                        "MERCANCIA EN TRANSITO": {}, 
-                        "MERCANCIA EN TRANSITOS": {}
-                    }, 
-                    "INVENTARIOS DE MERCANCIA": {
-                        "INVENTARIO FINAL": {}, 
-                        "INVENTARIO MERCANCIA ACTUALIZACION DEL VALOR": {}, 
-                        "INVENTARIOS DE MERCANCIA EXTERIOR": {}, 
-                        "INVENTARIOS DE MERCANCIA NACIONAL": {}
-                    }
+                    "account_type": "Stock", 
+                    "is_group": 1
                 }
             }, 
             "ACTIVO LARGO PLAZO": {
                 "ACTIVO FIJO NETO": {
                     "ACTIVO FIJO": {
-                        "INMUEBLES COSTO ORIGINAL": {}, 
+                        "INMUEBLES COSTO ORIGINAL": {
+                            "account_type": "Fixed Asset"
+                        }, 
                         "LICENCIA Y SOFTWARE COSTO ORIGINAL": {}, 
-                        "MAQUINARIAS Y EQUIPOS COSTO ORIGINAL": {}, 
-                        "MUEBLES Y ENSERES COSTO ORIGINAL": {}, 
+                        "MAQUINARIAS Y EQUIPOS COSTO ORIGINAL": {
+                            "account_type": "Fixed Asset"
+                        }, 
+                        "MUEBLES Y ENSERES COSTO ORIGINAL": {
+                            "account_type": "Fixed Asset"
+                        }, 
                         "TERRENO COSTO ORIGINAL": {}, 
-                        "VEHICULOS COSTO ORIGINAL": {}
+                        "VEHICULOS COSTO ORIGINAL": {
+                            "account_type": "Fixed Asset"
+                        }, 
+                        "account_type": "Fixed Asset"
                     }, 
                     "DEPRECIACION Y AMORTIZACION ACUMULADAS": {
-                        "INMUEBLES COSTO ORIGINAL": {}, 
-                        "LICENCIA Y SOFTWARE COSTO ORIGINAL": {}, 
-                        "MAQUINARIAS Y EQUIPOS COSTO ORIGINAL": {}, 
+                        "INMUEBLES COSTO ORIGINAL 1": {
+                            "account_type": "Accumulated Depreciation"
+                        }, 
+                        "LICENCIA Y SOFTWARE COSTO ORIGINAL 1": {}, 
+                        "MAQUINARIAS Y EQUIPOS COSTO ORIGINAL 1": {
+                            "account_type": "Accumulated Depreciation"
+                        }, 
                         "MEJORAS A PROPIEDAD COSTO ORIGINAL": {}, 
-                        "MUEBLES Y ENSERES COSTO ORIGINAL": {}, 
+                        "MUEBLES Y ENSERES COSTO ORIGINAL 1": {
+                            "account_type": "Accumulated Depreciation"
+                        }, 
                         "TERRENOS COSTO ORIGINAL": {}, 
-                        "VEHICULOS COSTO ORIGINAL": {}
+                        "VEHICULOS COSTO ORIGINAL 1": {
+                            "account_type": "Accumulated Depreciation"
+                        }, 
+                        "account_type": "Accumulated Depreciation"
                     }
                 }, 
                 "CARGOS DIFERIDOS": {
-                    "CARGOS DIFERIDOS": {
+                    "CARGOS DIFERIDOS 1": {
                         "GASTOS DE CONSTITUCION": {}, 
                         "MARCA DE FABRICA": {}, 
                         "OTRAS CUENTAS POR COBRAR": {
@@ -145,7 +162,7 @@
                 }, 
                 "IMPUESTOS DIFERIDOS": {
                     "IMPUESTOS DIFERIDOS ISR ": {
-                        "IMPUESTOS DIFERIDOS ISR ": {}
+                        "IMPUESTOS DIFERIDOS ISR  1": {}
                     }
                 }, 
                 "INVERSIONES LARGO PLAZO": {
@@ -156,44 +173,44 @@
                     }
                 }, 
                 "OTROS ACTIVOS": {
-                    "OTROS ACTIVOS": {
+                    "OTROS ACTIVOS 1": {
                         "DEPOSITOS GARANTIA ARRENDAMIENTO LOCAL": {}, 
                         "DEPOSITOS GARANTIA BANCOS": {}, 
                         "DEPOSITOS GARANTIA PROVEEDORES": {}
                     }
                 }
             }, 
-            "root_type": ""
+            "root_type": "Asset"
         }, 
         "CAPITAL": {
             "CAPITAL SOCIAL": {
                 "ACCIONES EN TESORERIA": {
-                    "ACCIONES EN TESORERIA": {
-                        "ACCIONES EN TESORERIA": {}, 
+                    "ACCIONES EN TESORERIA 1": {
+                        "ACCIONES EN TESORERIA 2": {}, 
                         "ACTUALIZACION DE VALOR": {}
                     }
                 }, 
                 "CAPITAL SOCIAL PAGADO": {
-                    "CAPITAL SOCIAL PAGADO": {
-                        "ACTUALIZACION DEL VALOR": {}, 
-                        "CAPITAL SOCIAL": {}
+                    "CAPITAL SOCIAL PAGADO 1": {
+                        "ACTUALIZACION DEL VALOR 1": {}, 
+                        "CAPITAL SOCIAL 1": {}
                     }
                 }
             }, 
             "GANANCIAS Y PERDIDAS": {
                 "GANACIAS Y PERDIDAS": {
-                    "GANACIAS Y PERDIDAS": {}
+                    "GANACIAS Y PERDIDAS 1": {}
                 }
             }, 
             "RESERVA DE CAPITAL": {
                 "OTRAS RESERVAS": {
-                    "OTRAS RESERVAS": {
+                    "OTRAS RESERVAS 1": {
                         "ACTUALIZACION DEL VALOR": {}, 
                         "VALOR ORIGINAL": {}
                     }
                 }, 
                 "RESERVA LEGAL": {
-                    "RESERVA LEGAL": {
+                    "RESERVA LEGAL 1": {
                         "RESERVA P/FUTURO AUMENTO DE CAPITAL": {}, 
                         "VALOR ORIGINAL RESERVA LEGAL": {}
                     }
@@ -201,7 +218,7 @@
             }, 
             "SUPERAVIT": {
                 "RESULT.POR TENDENCIA DE ACTIVO NO MONETARIOS": {
-                    "RESULT.POR TENDENCIA DE ACTIVO NO MONETARIOS": {}
+                    "RESULT.POR TENDENCIA DE ACTIVO NO MONETARIOS 1": {}
                 }, 
                 "SUPERAVIT GANADO": {
                     "RESULTADO POR EXPOS. A LA INFLACION": {
@@ -215,22 +232,21 @@
                     }
                 }
             }, 
-            "root_type": ""
+            "root_type": "Equity"
         }, 
         "COSTO": {
-            "COSTO DE VENTAS": {
-                "COSTO DE VENTAS": {
-                    "COSTO DE VENTAS": {
-                        "COSTO DE VENTAS": {}
-                    }
-                }
+            " Gastos incluidos en la valoraci\u00f3n": {
+                "account_type": "Expenses Included In Valuation"
             }, 
-            "root_type": ""
+            "COSTO DE VENTAS": {
+                "account_type": "Cost of Goods Sold"
+            }, 
+            "root_type": "Expense"
         }, 
         "CUENTAS DE ORDEN": {
-            "CUENTAS DE ORDEN": {
+            "CUENTAS DE ORDEN 1": {
                 "CUENTAS DE ORDEN DEUDORAS": {
-                    "CUENTAS DE ORDEN DEUDORAS": {
+                    "CUENTAS DE ORDEN DEUDORAS 1": {
                         "CARTAS DE CREDITOS": {}, 
                         "MERCANCIAS COMPRADAS EN TRANSITO": {}, 
                         "MERCANCIAS EN CONSIGNACION": {}
@@ -238,14 +254,14 @@
                 }
             }, 
             "CUENTAS DE ORDEN ACREEDORAS": {
-                "CUENTAS DE ORDEN ACREEDORAS": {
-                    "CUENTAS DE ORDEN ACREEDORAS": {
+                "CUENTAS DE ORDEN ACREEDORAS 1": {
+                    "CUENTAS DE ORDEN ACREEDORAS 2": {
                         "MERCANCIA EN CONSIGNACION P. COMPRA": {}, 
                         "MERCANCIA VENDIDAS EN TRANSITO": {}
                     }
                 }
             }, 
-            "root_type": ""
+            "root_type": "Asset"
         }, 
         "GASTOS": {
             "GASTOS OPERATIVOS": {
@@ -256,10 +272,19 @@
                     "DEPRECIACION": {
                         "INMUEBLES": {}, 
                         "LICENCIA Y SOFTWARE": {}, 
-                        "MAQUINARIAS Y EQUIPOS": {}, 
-                        "MEJORAS A PROPIEDAD": {}, 
-                        "MUEBLES Y ENSERES": {}, 
-                        "VEHICULOS": {}
+                        "MAQUINARIAS Y EQUIPOS": {
+                            "account_type": "Depreciation"
+                        }, 
+                        "MEJORAS A PROPIEDAD": {
+                            "account_type": "Depreciation"
+                        }, 
+                        "MUEBLES Y ENSERES": {
+                            "account_type": "Depreciation"
+                        }, 
+                        "VEHICULOS": {
+                            "account_type": "Depreciation"
+                        }, 
+                        "account_type": "Depreciation"
                     }
                 }, 
                 "GASTOS COMERCIALIZACION": {
@@ -270,10 +295,10 @@
                         "EVENTOS ESPECIALES": {}, 
                         "MATERIALES PROMOCIONALES": {}, 
                         "MEDIOS": {}, 
-                        "PATENTE INDUSTRIA Y COMERCIO": {}, 
+                        "PATENTE INDUSTRIA Y COMERCIO 1": {}, 
                         "PRODUCCION MATERIAL P.O.P.": {}, 
                         "PROMOCIONES": {}, 
-                        "PUBLICIDAD": {}, 
+                        "PUBLICIDAD 1": {}, 
                         "TRANSPORTE Y FLETES": {}
                     }
                 }, 
@@ -285,7 +310,7 @@
                         "BENEFICIOS COMEDOR": {}, 
                         "BENEFICIOS SERVICIOS MEDICOS": {}, 
                         "BENEFICIOS UNIFORMES": {}, 
-                        "BONIFICACION UNICA ESPECIAL": {}, 
+                        "BONIFICACION UNICA ESPECIAL 1": {}, 
                         "BONO VACACIONAL": {}, 
                         "COMISION AL PERSONAL": {}, 
                         "CONTRIBUCIONES": {}, 
@@ -294,23 +319,27 @@
                         "HONORARIOS POR PARTIPACION JUNTA DIRECTIVA": {}, 
                         "HORAS EXTRAORDINARIAS": {}, 
                         "HORAS EXTRAS": {}, 
-                        "INTERESES S/PRESTACIONES SOCIALES": {}, 
-                        "PRESTACIONES SOCIALES": {}, 
+                        "INTERESES S/PRESTACIONES SOCIALES 2": {}, 
+                        "PRESTACIONES SOCIALES 1": {}, 
                         "PRIMA POR RENDIMIENTO": {}, 
                         "PROGRAMA DE ALIMENTACION EMPLEADOS": {}, 
                         "SUELDOS DIRECTIVOS": {}, 
                         "SUELDOS EMPLEADOS": {}, 
                         "TRANSPORTE Y ALIMENTACION": {}, 
-                        "UTILIDADES": {}, 
-                        "VACACIONES": {}, 
+                        "UTILIDADES 2": {}, 
+                        "VACACIONES 2": {}, 
                         "VIATICOS Y GASTOS DE REPRESENTACION": {}
                     }
                 }, 
                 "GASTOS GENERALES": {
-                    "GASTOS GENERALES": {
+                    "GASTOS GENERALES 1": {
                         "AGUA POTABLE Y REFRIGERIO": {}, 
-                        "AJUSTE DE INVENTARIOS DONADOS": {}, 
-                        "AJUSTE DE INVENTARIOS OBSOLETOS": {}, 
+                        "AJUSTE DE INVENTARIOS DONADOS": {
+                            "account_type": "Stock Adjustment"
+                        }, 
+                        "AJUSTE DE INVENTARIOS OBSOLETOS": {
+                            "account_type": "Stock Adjustment"
+                        }, 
                         "ARRENDAMIENTO": {}, 
                         "ARTICULOS DE OFICINA": {}, 
                         "ASEO URBANO": {}, 
@@ -320,7 +349,7 @@
                         "BONIFICACION UNICA ESPECIAL": {}, 
                         "COMBUSTIBLES": {}, 
                         "COMIDAS, VIAJES Y TRASLADOS": {}, 
-                        "CONDOMINIOS": {}, 
+                        "CONDOMINIOS 1": {}, 
                         "CONVENSION  DE COMERCIALIZACION": {}, 
                         "DERECHO DE FRENTE": {}, 
                         "ENERGIA ELECTRICA": {}, 
@@ -342,7 +371,7 @@
                         "REMANENTES DISTRIBUIBLES": {}, 
                         "REPARACIONES": {}, 
                         "REPAROS": {}, 
-                        "SEGUROS": {}, 
+                        "SEGUROS 1": {}, 
                         "SERVICIOS CONTRATADOS A TERCEROS": {}, 
                         "SERVICIOS DE PUBLICIDAD": {}, 
                         "SERVICIOS PUBLICOS": {}, 
@@ -356,17 +385,17 @@
                     }
                 }
             }, 
-            "root_type": ""
+            "root_type": "Expense"
         }, 
         "INGRESOS": {
             "INGRESOS OPERACIONALES": {
-                "INGRESOS OPERACIONALES": {
+                "INGRESOS OPERACIONALES 1": {
                     "DESCUENTOS Y DEVOLUCION EN VENTAS": {
                         "DESCUENTOS EN VENTAS": {}, 
                         "DEVOLUCIONES EN VENTAS": {}
                     }, 
                     "INGRESOS POR SERVICIOS": {
-                        "INGRESOS POR SERVICIOS": {}
+                        "INGRESOS POR SERVICIOS 1": {}
                     }, 
                     "VENTAS": {
                         "VENTAS EXPORTACION": {}, 
@@ -376,7 +405,7 @@
                     }
                 }
             }, 
-            "root_type": ""
+            "root_type": "Income"
         }, 
         "OTROS INGRESOS (EGRESOS)": {
             "EGRESOS": {
@@ -384,17 +413,17 @@
                     "EGRESOS NO GRAVABLES": {
                         "IMPUESTOS A LAS TRANSACIONES FINANCIERAS": {}
                     }, 
-                    "GASTOS FINANCIEROS": {
+                    "GASTOS FINANCIEROS 1": {
                         "COMISIONES TICKET DE ALIMENTACION": {}, 
                         "COMISIONES Y GASTOS BANCARIOS": {}, 
                         "INTERESES BANCOS NACIONALES": {}, 
                         "INTERESES POR FINANCIAMIENTOS": {}, 
                         "OTROS EGRESOS": {}
                     }, 
-                    "OTROS EGRESOS": {
+                    "OTROS EGRESOS 1": {
                         "AJUSTE DE A\u00d1OS ANTERIORES": {}, 
                         "FLUCTUACION CAMBIARIA NO REALIZADAS": {}, 
-                        "INTERESES S/PRESTACIONES SOCIALES": {}, 
+                        "INTERESES S/PRESTACIONES SOCIALES 1": {}, 
                         "PERDIDA POR ROBO DE INVENTARIO": {}, 
                         "PERDIDAS EN DIFERENCIAL CAMBIARIO": {}, 
                         "PERDIDAS EN INVERSIONES DE BONOS P.": {}, 
@@ -404,26 +433,29 @@
                 }
             }, 
             "OTROS INGRESOS": {
-                "OTROS INGRESOS": {
+                "OTROS INGRESOS 1": {
                     "INGRESOS FINANCIEROS": {
                         "INTERESES DE BANCOS EXTRANJEROS": {}, 
                         "INTERESES DE BANCOS NACIONALES": {}, 
                         "OTROS INGRESOS FINANCIEROS": {}
                     }, 
-                    "OTROS INGRESOS": {
+                    "OTROS INGRESOS 2": {
                         "GANANCIAS EN DIFERENCIAL CAMBIARIO": {}, 
                         "GANANCIAS EN VENTAS DE ACTIVOS FIJOS": {}, 
                         "GANANCIAS EN VENTAS DE INVERSIONES": {}, 
                         "INTERESES VARIOS": {}, 
-                        "OTROS INGRESOS": {}
+                        "OTROS INGRESOS 3": {}
                     }
                 }
             }, 
-            "root_type": ""
+            "root_type": "Income"
         }, 
         "PASIVO": {
+            " Stock recibidas, pero no facturada": {
+                "account_type": "Stock Received But Not Billed"
+            }, 
             "OTROS PASIVOS A CORTO PLAZO": {
-                "OTROS PASIVOS A CORTO PLAZO": {
+                "OTROS PASIVOS A CORTO PLAZO 1": {
                     "IMPUESTOS POR PAGAR": {
                         "1% DE RET CEDULAR ARRENDAMIETOS (GUANAJUATO)": {}, 
                         "10% ISR RETENIDO ARRENDAMIENTO": {}, 
@@ -443,19 +475,15 @@
             "PASIVO A CORTO PLAZO": {
                 "ACUMULACIONES LABORALES": {
                     "APORTES EMPLEADOS": {
-                        "APORTES EMPLEADOS": {}, 
+                        "APORTES EMPLEADOS 1": {}, 
                         "FONDO DE AHORRO": {}, 
                         "FONDO FIDEICOMISO": {}
                     }
                 }, 
                 "DIVIDENDO POR PAGAR": {
-                    "DIVIDENDO POR PAGAR": {
-                        "DIVDENDO POR COBRAR NO COBRADOS": {
-                            "account_type": "Receivable"
-                        }, 
-                        "DIVIDENDO POR PAGAR VIGENTES": {
-                            "account_type": "Payable"
-                        }
+                    "DIVIDENDO POR PAGAR 1": {
+                        "DIVDENDO POR COBRAR NO COBRADOS": {}, 
+                        "DIVIDENDO POR PAGAR VIGENTES": {}
                     }
                 }, 
                 "DOCUMENTOS Y CUENTAS POR PAGAR": {
@@ -463,7 +491,8 @@
                     "CUENTAS POR PAGAR ACCIONISTAS": {
                         "CUENTAS POR PAGAR SOCIOS": {
                             "account_type": "Payable"
-                        }
+                        }, 
+                        "account_type": "Payable"
                     }, 
                     "PROVEEDORES EXTRANJEROS": {}, 
                     "PROVEEDORES OCASIONALES": {
@@ -475,8 +504,10 @@
                         }, 
                         "TARJETA DE CREDITO X": {
                             "account_type": "Payable"
-                        }
-                    }
+                        }, 
+                        "account_type": "Payable"
+                    }, 
+                    "account_type": "Payable"
                 }, 
                 "GASTOS ACUMULADOS Y RETENCIONES POR PAGAR": {
                     "CONTRIBUCIONES PATRONAL": {
@@ -492,8 +523,8 @@
                         "IMPUESTOS MUNICIPALES POR PAGAR": {
                             "account_type": "Payable"
                         }, 
-                        "IMPUESTOS POR PAGAR": {
-                            "account_type": "Payable"
+                        "IMPUESTOS POR PAGAR 1": {
+                            "account_type": "Tax"
                         }, 
                         "INTERESES S/PRESTACIONES SOCIALES": {}, 
                         "NOMINA POR PAGAR": {
@@ -525,7 +556,7 @@
                 "IMPUESTOS SOBRE LA RENTA POR PAGAR": {
                     "ISR  ACUMULADOS GASTOS": {
                         "DECLARACION ESTIMADAS": {}, 
-                        "ISR  ACUMULADOS GASTOS": {}, 
+                        "ISR  ACUMULADOS GASTOS 1": {}, 
                         "RAR AJUSTE INICIAL POR INFLACION": {}
                     }
                 }, 
@@ -535,7 +566,7 @@
                     }
                 }, 
                 "RESERVAS": {
-                    "RESERVAS": {
+                    "RESERVAS 1": {
                         "RESERVAS FINANCIERAS": {}, 
                         "RESERVAS FISCALES": {}, 
                         "RESERVAS OPERATIVAS": {}
@@ -550,22 +581,22 @@
                     }
                 }, 
                 "OTROS PASIVOS A LARGO PLAZO": {
-                    "OTROS PASIVOS A LARGO PLAZO": {
-                        "OTROS PASIVOS A LARGO PLAZO": {}
+                    "OTROS PASIVOS A LARGO PLAZO 1": {
+                        "OTROS PASIVOS A LARGO PLAZO 2": {}
                     }
                 }, 
                 "PASIVOS FINANCIEROS A LARGO PLAZO": {
-                    "PASIVOS FINANCIEROS A LARGO PLAZO": {
-                        "PASIVOS FINANCIEROS A LARGO PLAZO": {}
+                    "PASIVOS FINANCIEROS A LARGO PLAZO 1": {
+                        "PASIVOS FINANCIEROS A LARGO PLAZO 2": {}
                     }
                 }, 
                 "PASIVOS INTERCOMPA\u00d1IAS": {
-                    "PASIVOS INTERCOMPA\u00d1IAS": {
-                        "PASIVOS INTERCOMPA\u00d1IAS": {}
+                    "PASIVOS INTERCOMPA\u00d1IAS 1": {
+                        "PASIVOS INTERCOMPA\u00d1IAS 2": {}
                     }
                 }
             }, 
-            "root_type": ""
+            "root_type": "Liability"
         }
     }
 }

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

@@ -0,0 +1,494 @@
+{
+    "country_code": "ni", 
+    "name": "Nicaragua - Catalogo de Cuentas", 
+    "tree": {
+        "Activo": {
+            "Activo Corriente": {
+                "Activos Financieros Realizables a Corto Plazo": {
+                    "Bonos y Acciones Disponibles para la Venta": {}, 
+                    "Certificados Bancarios": {}, 
+                    "Inversiones a Corto Plazo": {}, 
+                    "Otros Valores Negociables a Corto Plazo": {}
+                }, 
+                "Cuentas y Documentos por Cobrar a Clientes": {
+                    "Cuentas por Cobrar Moneda Extrangera": {
+                        "account_type": "Receivable"
+                    }, 
+                    "Cuentas por Cobrar Moneda Nacional": {
+                        "account_type": "Receivable"
+                    }, 
+                    "Cuentas por Cobrar por Exportaciones": {
+                        "account_type": "Receivable"
+                    }, 
+                    "Documentos por Cobrar Moneda Extrangera": {
+                        "account_type": "Receivable"
+                    }, 
+                    "Documentos por Cobrar Moneda Nacional": {
+                        "account_type": "Receivable"
+                    }, 
+                    "Estimacion para Cuentas Incobrables": {}
+                }, 
+                "Efectivo en Caja y Bancos": {
+                    "Caja": {
+                        "Caja Chica Moneda Extrangera": {
+                            "account_type": "Cash"
+                        }, 
+                        "Caja Chica Moneda Nacional": {
+                            "account_type": "Cash"
+                        }, 
+                        "Caja General Moneda Extrangera": {
+                            "account_type": "Cash"
+                        }, 
+                        "Caja General Moneda Nacional": {
+                            "account_type": "Cash"
+                        }, 
+                        "Fondos por Depositar": {
+                            "account_type": "Cash"
+                        }
+                    }, 
+                    "Cuentas Bancarias": {
+                        "Cuenta Corriente Moneda Extrangera": {
+                            "account_type": "Bank"
+                        }, 
+                        "Cuenta Corriente Moneda Nacional": {
+                            "account_type": "Bank"
+                        }, 
+                        "account_type": "Bank"
+                    }, 
+                    "Otros Equivalentes a Efectivo": {
+                        "account_type": "Cash", 
+                        "is_group": 1
+                    }
+                }, 
+                "Impuestos Acreditables": {
+                    "Anticipos de IR o Pago Minimo Definitivo": {}, 
+                    "Impuesto a Valor Agregado Acreditable": {
+                        "Acreditacion Proporcional": {}, 
+                        "IVA Acreditable por Compra de Bienes": {
+                            "account_type": "Tax"
+                        }, 
+                        "IVA Acreditable por Importaciones": {
+                            "account_type": "Tax"
+                        }, 
+                        "IVA Acreditable por Prestacion de Servicios y Uso y Goce de Bienes": {
+                            "account_type": "Tax"
+                        }
+                    }, 
+                    "Retenciones Definitivas Sobre Rentas o Ganancias de Capital": {}, 
+                    "Retenciones a Cuenta de IMI Acreditables": {}, 
+                    "Retenciones a Cuenta de IR Acreditables": {
+                        "Retencion Operaciones Targeta Debito/Credito 1.5%": {
+                            "account_type": "Tax"
+                        }, 
+                        "Retencion por V/Bienes o P/Servicios 2%": {
+                            "account_type": "Tax"
+                        }
+                    }
+                }, 
+                "Inventarios": {
+                    "Ajuste de Inventarios": {
+                        "account_type": "Stock Adjustment"
+                    }, 
+                    "Todos los Almacenes": {
+                        "account_type": "Stock", 
+                        "is_group": 1
+                    }, 
+                    "account_type": "Stock"
+                }, 
+                "Otras Cuentas por Cobrar": {
+                    "account_type": "Receivable", 
+                    "is_group": 1
+                }
+            }, 
+            "Activo no Corriente": {
+                "Activo por Impuestos Diferidos": {
+                    "is_group": 1
+                }, 
+                "Activos Intangibles": {
+                    "Amortizacion de Activos Intangibles": {
+                        "is_group": 1
+                    }, 
+                    "Concesiones": {
+                        "is_group": 1
+                    }, 
+                    "Derechos de Autor": {
+                        "is_group": 1
+                    }, 
+                    "Deterioro de Valor de Activos Intangibles": {}, 
+                    "Gastos de investigacion": {
+                        "is_group": 1
+                    }, 
+                    "Licencias": {
+                        "is_group": 1
+                    }, 
+                    "Marcas Registradas": {
+                        "is_group": 1
+                    }, 
+                    "Patentes": {
+                        "is_group": 1
+                    }
+                }, 
+                "Amortizables": {
+                    "Amortizacion de Activos Amortizables": {}, 
+                    "Deterioro de Valaor de Activos Amortizables": {}, 
+                    "Gastos Pre Operativos": {
+                        "account_type": "Expenses Included In Valuation"
+                    }, 
+                    "Gastos de Consitucion": {
+                        "account_type": "Expenses Included In Valuation"
+                    }, 
+                    "Mejoras en Bienes Arrendados": {
+                        "is_group": 1
+                    }
+                }, 
+                "Bienes en Arrendamiento Financiero": {
+                    "Equipos y Maquinaria en Arrendamiento": {}, 
+                    "Locales y Edificios en Arrendamiento": {}
+                }, 
+                "Cuentas por Cobrar a Largo Plazo": {
+                    "Creditos a Largo Plazo": {
+                        "is_group": 1
+                    }
+                }, 
+                "Inversiones Permanentes": {
+                    "Inversiones Permanentes 1": {
+                        "account_type": "Fixed Asset", 
+                        "is_group": 1
+                    }, 
+                    "Negocios Conjuntos": {
+                        "account_type": "Fixed Asset", 
+                        "is_group": 1
+                    }
+                }, 
+                "Inversiones a Largo Plazo": {
+                    "Depositos Bancarios a Plazo": {
+                        "is_group": 1
+                    }, 
+                    "Intereses percibidos por adelantado": {
+                        "is_group": 1
+                    }, 
+                    "Titulos y Acciones": {
+                        "is_group": 1
+                    }
+                }, 
+                "Propiedad Planta y Equipo": {
+                    "Almacenes": {}, 
+                    "Depresiacion Acumulada": {
+                        "account_type": "Depreciation"
+                    }, 
+                    "Edificios": {}, 
+                    "Equipo de Computo": {}, 
+                    "Maquinaria Industrial": {}, 
+                    "Mobiliario y Equipo de Oficinas": {}, 
+                    "Otra Bienes Mobiliarios": {
+                        "account_type": "Fixed Asset"
+                    }, 
+                    "Otros Activos Inmobiliarios": {}, 
+                    "Parque Vehicular": {}, 
+                    "Terrenos": {}, 
+                    "account_type": "Fixed Asset"
+                }
+            }, 
+            "root_type": "Asset"
+        }, 
+        "Capital y Patrimonio": {
+            "Aporte de Socios": {
+                "Capital": {
+                    "Capital Social Pagado": {
+                        "account_type": "Equity"
+                    }, 
+                    "Capital Social no Pagado": {
+                        "account_type": "Equity"
+                    }
+                }
+            }, 
+            "Donaciones": {
+                "is_group": 1
+            }, 
+            "Ganancias Acumuladas": {
+                "Reservas": {
+                    "Reservas Legales": {
+                        "account_type": "Equity"
+                    }, 
+                    "Reservas Voluntarias": {
+                        "account_type": "Equity"
+                    }
+                }, 
+                "Resultados": {
+                    "Ajustes a Periodos Anteriores": {
+                        "account_type": "Equity"
+                    }, 
+                    "Resultado del ejercicio": {
+                        "account_type": "Equity"
+                    }, 
+                    "Resultados Acumulados": {
+                        "account_type": "Equity"
+                    }
+                }
+            }, 
+            "root_type": "Equity"
+        }, 
+        "Costos y Gastos": {
+            "Costo de Venta": {
+                "Costo de Bienes": {
+                    "account_type": "Cost of Goods Sold"
+                }, 
+                "Costo de Produccion": {
+                    "account_type": "Cost of Goods Sold"
+                }, 
+                "Costo de Servicios": {
+                    "account_type": "Cost of Goods Sold"
+                }, 
+                "account_type": "Cost of Goods Sold"
+            }, 
+            "Costos y Gastos No Deducibles": {}, 
+            "Gastopor Depreciacion": {
+                "account_type": "Depreciation"
+            }, 
+            "Gastos de Administracion": {
+                "Alquileres": {}, 
+                "Amortizaciones": {}, 
+                "Ayuda a Empleados": {}, 
+                "Capacitacion al Personal": {}, 
+                "Combustible": {}, 
+                "Cuentas Incobrables": {}, 
+                "Donaciones 1": {}, 
+                "Fletes y Correos": {}, 
+                "Gastos Varios": {}, 
+                "IVA Proporcional no Acreditado": {}, 
+                "Impuesto Municipal": {}, 
+                "Inatec": {}, 
+                "Indemnizacion": {}, 
+                "Mantenimiento y Reparaciones": {}, 
+                "Matricula": {}, 
+                "Papeleria": {}, 
+                "Recoleccion de Basura": {}, 
+                "Representacion": {}, 
+                "Seguros": {}, 
+                "Servicios Basicos": {
+                    "Agua Potable": {}, 
+                    "Celular": {}, 
+                    "Costos por Servicios WEB": {}, 
+                    "Energia Electrica": {}, 
+                    "Internet": {}, 
+                    "Telefono Fijo": {}
+                }, 
+                "Uniformes": {}, 
+                "Vigilancia": {}
+            }, 
+            "Gastos de Ventas": {
+                "Fletes": {}, 
+                "Mercadeo": {}, 
+                "Muestras Gratis": {}, 
+                "Promociones": {}, 
+                "Publicidad": {}, 
+                "Regalosa Clientes": {}
+            }, 
+            "Gastos por Salarios y Otras Compensaciones": {}, 
+            "Gastos por Servicios Profesionales y Tecnicos": {}, 
+            "Impuesto por Rentas y Ganancias de Capital": {}, 
+            "Impuesto sobre la Rentade Activividades Economicas": {}, 
+            "Otros Gastos": {
+                "Certificacion de Cheques y Chequeras": {}, 
+                "Perdida Cambiario": {}, 
+                "P\u00e9rdida en Venta de Activo Fijo": {
+                    "account_type": "Cost of Goods Sold"
+                }, 
+                "Siniestros": {}
+            }, 
+            "root_type": "Expense"
+        }, 
+        "Ingresos": {
+            "Ingresos no Grabables": {
+                "Ingreso por Rentas y Ganacias de Capital sujetas a Retencion Definitiva": {}, 
+                "Interes Bancarios": {}, 
+                "Otros Ingresos no Grabables": {}
+            }, 
+            "Otros Ingresos Grabables": {
+                "Ganacia Cambiaria": {}, 
+                "Otros Ingresos Grabables 1": {}, 
+                "Sobrante en Arqueo de Caja": {}
+            }, 
+            "Ventas": {
+                "Venta de Bienes o Prestacion de Servicios Exentos": {}, 
+                "Venta de Bienes o Prestacion de Servicios Exonerados": {}, 
+                "Venta de Bienes o Prestacion de Servicios Grabados": {}, 
+                "Venta por Exportaciones": {}
+            }, 
+            "root_type": "Income"
+        }, 
+        "Pasivo": {
+            "Obligaciones por Arrendamiento Financiero a Largo Plazo": {
+                "is_group": 1
+            }, 
+            "Pasivo Corriente": {
+                "Anticipos de Clientes": {}, 
+                "Cuentas por Pagar Proveedores": {
+                    "Bienes Adquiridos no Pagados": {
+                        "account_type": "Stock Received But Not Billed"
+                    }, 
+                    "Cuentas por Pagar Moneda Extrangera": {
+                        "account_type": "Payable"
+                    }, 
+                    "Cuentas por Pagar Moneda Nacional": {
+                        "account_type": "Payable"
+                    }, 
+                    "Cuentas por Pagar por Importaciones": {
+                        "account_type": "Payable"
+                    }, 
+                    "Documentos por Pagar Moneda Extrangera": {
+                        "account_type": "Payable"
+                    }, 
+                    "Documentos por Pagar Moneda Nacional": {
+                        "account_type": "Payable"
+                    }
+                }, 
+                "Gastos por Pagar": {
+                    "Prestaciones Sociales": {
+                        "is_group": 1
+                    }, 
+                    "Salarios por Pagar": {}, 
+                    "Servicios Basicos 1": {
+                        "is_group": 1
+                    }
+                }, 
+                "Impuestos por Pagar": {
+                    "Impuesto al Valor Agregado por Pagar": {
+                        "account_type": "Tax"
+                    }, 
+                    "Impuesto sobre la Renta por Actividades Economicas": {
+                        "account_type": "Tax"
+                    }, 
+                    "Impuestos Municipales": {
+                        "Impuesto Municipal Sobre Ingresos": {
+                            "account_type": "Tax"
+                        }, 
+                        "Matricula Municipal": {
+                            "account_type": "Tax"
+                        }, 
+                        "Recoleccion Basura": {
+                            "account_type": "Tax"
+                        }
+                    }
+                }, 
+                "Otras Cuentas por Pagar": {
+                    "is_group": 1
+                }, 
+                "Pasivos Financieros a Corto Plazo": {
+                    "Otras Deudas Bancarias": {
+                        "is_group": 1
+                    }, 
+                    "Prestamos por Pagar a Corto Plazo": {
+                        "is_group": 1
+                    }, 
+                    "Sobregiros Bancarios": {
+                        "is_group": 1
+                    }
+                }, 
+                "Provisiones por Pagar": {
+                    "Pasivos Laborales": {
+                        "Aguinaldo por Pagar": {}, 
+                        "Indemnizacion Laboral": {}
+                    }, 
+                    "Reclamos por Pagar": {}, 
+                    "Responsabilidad frente a terceros": {}
+                }, 
+                "Retenciones por Pagar": {
+                    "Rentas de Actividades Economicas": {
+                        "Otras Retenciones 10%": {
+                            "account_type": "Tax"
+                        }, 
+                        "Retencion 10% Servicios Profesionales": {
+                            "account_type": "Tax"
+                        }, 
+                        "Retencion 2% por C/Bienes o P/Servicios": {
+                            "account_type": "Tax"
+                        }, 
+                        "Retencion 3% compra Bienes Agropecuarios": {
+                            "account_type": "Tax"
+                        }, 
+                        "Retencion 5% compra Madera en Rollo": {
+                            "account_type": "Tax"
+                        }, 
+                        "Retencion Definitiva 1.5% Actividades Economicas No Residentes": {
+                            "account_type": "Tax"
+                        }, 
+                        "Retencion Definitiva 10% Actividades Economicas No Residentes": {
+                            "account_type": "Tax"
+                        }, 
+                        "Retencion Definitiva 15% Actividades Economicas No Residentes": {
+                            "account_type": "Tax"
+                        }, 
+                        "Retencion Definitiva 3% Actividades Economicas No Residentes": {
+                            "account_type": "Tax"
+                        }
+                    }, 
+                    "Rentas del Trabajo": {
+                        "Retencion Definitiva 10% por Rentas del Trabajo - Indemnizacion Adicional": {
+                            "account_type": "Tax"
+                        }, 
+                        "Retencion Definitiva 12.5% por Rentas del Trabajo - Dietas": {
+                            "account_type": "Tax"
+                        }, 
+                        "Retencion Definitiva 15% por Rentas del Trabajo - No Residentes": {
+                            "account_type": "Tax"
+                        }, 
+                        "Retencion Rentas del Trabajo Tarifa Progresiva": {
+                            "account_type": "Tax"
+                        }
+                    }, 
+                    "Rentas y Ganancias de Capital": {
+                        "Retencion Definitiva 0.25% Transacciones Bursatiles": {
+                            "account_type": "Tax"
+                        }, 
+                        "Retencion Definitiva 1% Transacciones Bursatiles": {
+                            "account_type": "Tax"
+                        }, 
+                        "Retencion Definitiva 1.5% Transacciones Bursatiles": {
+                            "account_type": "Tax"
+                        }, 
+                        "Retencion Definitiva 10% por Ganancia de Capital": {
+                            "account_type": "Tax"
+                        }, 
+                        "Retencion Definitiva 2% Transacciones Bursatiles": {
+                            "account_type": "Tax"
+                        }, 
+                        "Retencion Definitiva 5% por Rentas de Capital": {
+                            "account_type": "Tax"
+                        }, 
+                        "Retencion Defintiva 10% por Rentas de Capital": {
+                            "account_type": "Tax"
+                        }, 
+                        "Retencion Defintiva 15% por Rentas de Capital": {
+                            "account_type": "Tax"
+                        }, 
+                        "Retenciones Defintiva 5% Fondos de Inversion": {
+                            "account_type": "Tax"
+                        }
+                    }, 
+                    "Retencion 17% Operaciones con Paraisos Fiscales": {
+                        "account_type": "Tax"
+                    }
+                }
+            }, 
+            "Pasivo No Corriente": {
+                "Cuentas por Pagar a Largo Plaso": {
+                    "is_group": 1
+                }, 
+                "Otras Cuentas por Pagar a Largo Plazo": {
+                    "is_group": 1
+                }, 
+                "Otros Pasivos Financieros a Largo Plaso": {
+                    "is_group": 1
+                }, 
+                "Prestamos a Largo Plazo": {
+                    "is_group": 1
+                }
+            }, 
+            "Pasivo por Impuestos Diferidos": {
+                "is_group": 1
+            }, 
+            "root_type": "Liability"
+        }
+    }
+}

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

@@ -1,466 +0,0 @@
-{
-	"country_code": "ni",
-	"name": "Nicaragua - Catalogo de Cuentas",
-	"tree": {
-		"Activo": {
-			"Activo Corriente": {
-				"Efectivo en Caja y Bancos": {
-					"Caja": {
-						"Caja General Moneda Nacional": {
-							"account_type": "Cash"
-						},
-						"Caja General Moneda Extrangera": {
-							"account_type": "Cash"
-						},
-						"Caja Chica Moneda Nacional": {
-							"account_type": "Cash"
-						},
-						"Caja Chica Moneda Extrangera": {
-							"account_type": "Cash"
-						},
-						"Fondos por Depositar": {
-							"account_type": "Cash"
-						}
-					},
-					"Cuentas Bancarias": {
-						"Cuenta Corriente Moneda Nacional": {
-							"account_type": "Bank"
-						},
-						"Cuenta Corriente Moneda Extrangera": {
-							"account_type": "Bank"
-						}
-					},
-					"Otros Equivalentes a Efectivo": {
-						"is_group": 1,
-						"account_type": "Cash"
-					}
-				},
-				"Activos Financieros Realizables a Corto Plazo": {
-					"Inversiones a Corto Plazo": {},
-					"Bonos y Acciones Disponibles para la Venta": {},
-					"Certificados Bancarios": {},
-					"Otros Valores Negociables a Corto Plazo": {}
-				},
-				"Cuentas y Documentos por Cobrar a Clientes": {
-					"Cuentas por Cobrar Moneda Nacional": {
-						"account_type": "Receivable"
-					},
-					"Cuentas por Cobrar Moneda Extrangera": {
-						"account_type": "Receivable"
-					},
-					"Documentos por Cobrar Moneda Nacional": {
-						"account_type": "Receivable"
-					},
-					"Documentos por Cobrar Moneda Extrangera": {
-						"account_type": "Receivable"
-					},
-					"Cuentas por Cobrar por Exportaciones": {
-						"account_type": "Receivable"
-					},
-					"Estimacion para Cuentas Incobrables": {}
-				},
-				"Inventarios": {
-					"is_group": 1,
-					"account_type": "Stock"
-				},
-				"Impuestos Acreditables": {
-					"Impuesto a Valor Agregado Acreditable": {
-						"IVA Acreditable por Compra de Bienes": {
-							"account_type": "Tax"
-						},
-						"IVA Acreditable por Importaciones": {
-							"account_type": "Tax"
-						},
-						"IVA Acreditable por Prestacion de Servicios y Uso y Goce de Bienes": {
-							"account_type": "Tax"
-						},
-						"Acreditacion Proporcional": {}
-					},
-					"Anticipos de IR o Pago Minimo Definitivo": {},
-					"Retenciones a Cuenta de IR Acreditables": {
-						"Retencion por V/Bienes o P/Servicios 2%": {
-							"account_type": "Tax"
-						},
-						"Retencion Operaciones Targeta Debito/Credito 1.5%": {
-							"account_type": "Tax"
-						}
-					},
-					"Retenciones a Cuenta de IMI Acreditables": {},
-					"Retenciones Definitivas Sobre Rentas o Ganancias de Capital": {}
-				},
-				"Otras Cuentas por Cobrar": {
-					"is_group": 1,
-					"account_type": "Receivable"
-				}
-			},
-			"Activo no Corriente": {
-				"Propiedad Planta y Equipo": {
-					"Terrenos": {},
-					"Edificios": {},
-					"Almacenes": {},
-					"Otros Activos Inmobiliarios": {},
-					"Parque Vehicular": {},
-					"Equipo de Computo": {},
-					"Mobiliario y Equipo de Oficinas": {},
-					"Maquinaria Industrial": {},
-					"Otra Bienes Mobiliarios": {},
-					"Depresiacion Acumulada": {},
-					"account_type": "Fixed Asset"
-				},
-				"Inversiones Permanentes": {
-					"Inversiones Permanentes": {
-						"is_group": 1,
-						"account_type": "Fixed Asset"
-					},
-					"Negocios Conjuntos": {
-						"is_group": 1,
-						"account_type": "Fixed Asset"
-					}
-				},
-				"Bienes en Arrendamiento Financiero": {
-					"Locales y Edificios en Arrendamiento": {},
-					"Equipos y Maquinaria en Arrendamiento": {}
-				},
-				"Activos Intangibles": {
-					"Patentes": {
-						"is_group": 1
-					},
-					"Marcas Registradas": {
-						"is_group": 1
-					},
-					"Derechos de Autor": {
-						"is_group": 1
-					},
-					"Concesiones": {
-						"is_group": 1
-					},
-					"Licencias": {
-						"is_group": 1
-					},
-					"Gastos de investigacion": {
-						"is_group": 1
-					},
-					"Amortizacion de Activos Intangibles": {
-						"is_group": 1
-					},
-					"Deterioro de Valor de Activos Intangibles": {}
-				},
-				"Amortizables": {
-					"Gastos de Consitucion": {},
-					"Gastos Pre Operativos": {},
-					"Mejoras en Bienes Arrendados": {
-						"is_group": 1
-					},
-					"Amortizacion de Activos Amortizables": {},
-					"Deterioro de Valaor de Activos Amortizables": {}
-				},
-				"Cuentas por Cobrar a Largo Plazo": {
-					"Creditos a Largo Plazo": {
-						"is_group": 1
-					}
-				},
-				"Inversiones a Largo Plazo": {
-					"Depositos Bancarios a Plazo": {
-						"is_group": 1
-					},
-					"Intereses percibidos por adelantado": {
-						"is_group": 1
-					},
-					"Titulos y Acciones": {
-						"is_group": 1
-					}
-				},
-				"Activo por Impuestos Diferidos": {
-					"is_group": 1
-				}
-			},
-			"root_type": "Asset"
-		},
-		"Pasivo": {
-			"Pasivo Corriente": {
-				"Cuentas por Pagar Proveedores": {
-					"Cuentas por Pagar Moneda Nacional": {
-						"account_type": "Payable"
-					},
-					"Cuentas por Pagar Moneda Extrangera": {
-						"account_type": "Payable"
-					},
-					"Documentos por Pagar Moneda Nacional": {
-						"account_type": "Payable"
-					},
-					"Documentos por Pagar Moneda Extrangera": {
-						"account_type": "Payable"
-					},
-					"Cuentas por Pagar por Importaciones": {
-						"account_type": "Payable"
-					}
-				},
-				"Anticipos de Clientes": {},
-				"Pasivos Financieros a Corto Plazo": {
-					"Prestamos por Pagar a Corto Plazo": {
-						"is_group": 1
-					},
-					"Sobregiros Bancarios": {
-						"is_group": 1
-					},
-					"Otras Deudas Bancarias": {
-						"is_group": 1
-					}
-				},
-				"Gastos por Pagar": {
-					"Servicios Basicos": {
-						"is_group": 1
-					},
-					"Prestaciones Sociales": {
-						"is_group": 1
-					},
-					"Salarios por Pagar": {}
-				},
-				"Provisiones por Pagar": {
-					"Pasivos Laborales": {
-						"Indemnizacion Laboral": {},
-						"Aguinaldo por Pagar": {}
-					},
-					"Reclamos por Pagar": {},
-					"Responsabilidad frente a terceros": {}
-				},
-				"Impuestos por Pagar": {
-					"Impuesto al Valor Agregado por Pagar": {
-						"account_type": "Tax"
-					},
-					"Impuesto sobre la Renta por Actividades Economicas": {
-						"account_type": "Tax"
-					},
-					"Impuestos Municipales": {
-						"Impuesto Municipal Sobre Ingresos": {
-							"account_type": "Tax"
-						},
-						"Recoleccion Basura": {
-							"account_type": "Tax"
-						},
-						"Matricula Municipal": {
-							"account_type": "Tax"
-						}
-					}
-				},
-				"Retenciones por Pagar": {
-					"Rentas del Trabajo": {
-						"Retencion Rentas del Trabajo Tarifa Progresiva": {
-							"account_type": "Tax"
-						},
-						"Retencion Definitiva 10% por Rentas del Trabajo - Indemnizacion Adicional": {
-							"account_type": "Tax"
-						},
-						"Retencion Definitiva 12.5% por Rentas del Trabajo - Dietas": {
-							"account_type": "Tax"
-						},
-						"Retencion Definitiva 15% por Rentas del Trabajo - No Residentes": {
-							"account_type": "Tax"
-						}
-					},
-					"Rentas de Actividades Economicas": {
-						"Retencion 2% por C/Bienes o P/Servicios": {
-							"account_type": "Tax"
-						},
-						"Retencion 10% Servicios Profesionales": {
-							"account_type": "Tax"
-						},
-						"Retencion 3% compra Bienes Agropecuarios": {
-							"account_type": "Tax"
-						},
-						"Retencion 5% compra Madera en Rollo": {
-							"account_type": "Tax"
-						},
-						"Retencion Definitiva 1.5% Actividades Economicas No Residentes": {
-							"account_type": "Tax"
-						},
-						"Retencion Definitiva 3% Actividades Economicas No Residentes": {
-							"account_type": "Tax"
-						},
-						"Retencion Definitiva 10% Actividades Economicas No Residentes": {
-							"account_type": "Tax"
-						},
-						"Retencion Definitiva 15% Actividades Economicas No Residentes": {
-							"account_type": "Tax"
-						},									
-						"Otras Retenciones 10%": {
-							"account_type": "Tax"
-						}
-					},
-					"Rentas y Ganancias de Capital": {
-						"Retencion Defintiva 15% por Rentas de Capital": {
-							"account_type": "Tax"
-						},			
-						"Retencion Defintiva 10% por Rentas de Capital": {
-							"account_type": "Tax"
-						},
-						"Retencion Definitiva 5% por Rentas de Capital": {
-							"account_type": "Tax"
-						},
-						"Retencion Definitiva 10% por Ganancia de Capital": {
-							"account_type": "Tax"
-						},
-						"Retencion Definitiva 0.25% Transacciones Bursatiles": {
-							"account_type": "Tax"
-						},
-						"Retencion Definitiva 1% Transacciones Bursatiles": {
-							"account_type": "Tax"
-						},
-						"Retencion Definitiva 1.5% Transacciones Bursatiles": {
-							"account_type": "Tax"
-						},
-						"Retencion Definitiva 2% Transacciones Bursatiles": {
-							"account_type": "Tax"
-						},
-						"Retenciones Defintiva 5% Fondos de Inversion": {
-							"account_type": "Tax"
-						}
-					},
-					"Retencion 17% Operaciones con Paraisos Fiscales": {
-						"account_type": "Tax"
-					}
-				},
-				"Otras Cuentas por Pagar": {
-					"is_group": 1
-				}
-			},
-			"Pasivo No Corriente": {
-				"Prestamos a Largo Plazo": {
-					"is_group": 1
-				},
-				"Cuentas por Pagar a Largo Plaso": {
-					"is_group": 1
-				},
-				"Otras Cuentas por Pagar a Largo Plazo": {
-					"is_group": 1
-				},
-				"Otros Pasivos Financieros a Largo Plaso": {
-					"is_group": 1
-				}
-			},
-			"Obligaciones por Arrendamiento Financiero a Largo Plazo": {
-				"is_group": 1
-			},
-			"Pasivo por Impuestos Diferidos": {
-				"is_group": 1
-			},
-			"root_type": "Liability"
-		},
-		"Patrimonio": {
-			"Aporte de Socios": {
-				"Capital": {
-					"Capital Social Pagado": {
-						"account_type": "Equity"
-					},
-					"Capital Social no Pagado": {
-						"account_type": "Equity"
-					}
-				}
-			},
-			"Donaciones": {
-				"is_group": 1
-			},
-			"Ganancias Acumuladas": {
-				"Reservas": {
-					"Reservas Legales": {
-						"account_type": "Equity"
-					},
-					"Reservas Voluntarias": {
-						"account_type": "Equity"
-					}
-				},
-				"Resultados": {
-					"Resultados Acumulados": {
-						"account_type": "Equity"
-					},
-					"Ajustes a Periodos Anteriores": {
-						"account_type": "Equity"
-					},
-					"Resultado del ejercicio": {
-						"account_type": "Equity"
-					}
-				}
-			},
-			"root_type": "Equity"
-		},
-		"Ingresos": {
-			"Ventas": {
-				"Venta de Bienes o Prestacion de Servicios Grabados": {},
-				"Venta de Bienes o Prestacion de Servicios Exentos": {},
-				"Venta de Bienes o Prestacion de Servicios Exonerados": {},
-				"Venta por Exportaciones": {}
-			},
-			"Otros Ingresos Grabables": {
-				"Ganacia Cambiaria": {},
-				"Sobrante en Arqueo de Caja": {},
-				"Otros Ingresos Grabables": {}
-			},
-			"Ingresos no Grabables": {
-				"Ingreso por Rentas y Ganacias de Capital sujetas a Retencion Definitiva": {},
-				"Interes Bancarios": {},
-				"Otros Ingresos no Grabables": {}
-			},
-			"root_type": "Income"
-		},
-		"Costos y Gastos": {
-			"Costo de Venta": {
-				"Costo de Bienes": {},
-				"Costo de Servicios": {},
-				"Costo de Produccion": {},
-				"account_type": "Cost of Goods Sold"
-			},
-			"Gastos de Ventas": {
-				"Publicidad": {},
-				"Mercadeo": {},
-				"Muestras Gratis": {},
-				"Regalosa Clientes": {},
-				"Fletes": {},
-				"Promociones": {}
-			},
-			"Gastos de Administracion": {
-				"Alquileres": {},
-				"Combustible": {},
-				"Servicios Basicos": {
-					"Energia Electrica": {},
-					"Agua Potable": {},
-					"Internet": {},
-					"Telefono Fijo": {},
-					"Celular": {},
-					"Costos por Servicios WEB": {}
-				},
-				"Vigilancia": {},
-				"Gastos Varios": {},
-				"Mantenimiento y Reparaciones": {},
-				"Papeleria": {},
-				"Representacion": {},
-				"Amortizaciones": {},
-				"Inatec": {},
-				"Indemnizacion": {},
-				"Fletes y Correos": {},
-				"Cuentas Incobrables": {},
-				"Capacitacion al Personal": {},
-				"Uniformes": {},
-				"Seguros": {},
-				"Donaciones": {},
-				"Impuesto Municipal": {},
-				"Matricula": {},
-				"Recoleccion de Basura": {},
-				"IVA Proporcional no Acreditado": {},
-				"Ayuda a Empleados": {}
-			},
-			"Gastos por Servicios Profesionales y Tecnicos": {},
-			"Gastos por Salarios y Otras Compensaciones": {},
-			"Gastopor Depreciacion": {},
-			"Otros Gastos": {
-				"Perdida Cambiario": {},
-				"Perdida e nVenta de Activo Fijo": {},
-				"Siniestros": {},
-				"Certificacion de Cheques y Chequeras": {}
-			},
-			"Costos y Gastos No Deducibles": {},
-			"Impuesto por Rentas y Ganancias de Capital": {},
-			"Impuesto sobre la Rentade Activividades Economicas": {},
-			"root_type": "Expense"
-		}
-	}
-}

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

@@ -0,0 +1,693 @@
+{
+    "country_code": "nl", 
+    "name": "Netherlands - Grootboekschema", 
+    "tree": {
+        "FABRIKAGEREKENINGEN": {
+			"is_group": 1,
+            "root_type": "Expense"
+        }, 
+        "FINANCIELE REKENINGEN, KORTLOPENDE VORDERINGEN EN SCHULDEN": {
+            "Bank": {
+                "RABO Bank": {
+                    "account_type": "Bank"
+                }, 
+                "account_type": "Bank"
+            }, 
+            "KORTLOPENDE SCHULDEN": {
+                "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 1": {}, 
+                "Investeringsaftrek": {}, 
+                "Loonheffing": {}, 
+                "Overige te betalen posten": {}, 
+                "Pensioenpremies 1": {}, 
+                "Premie WIR": {}, 
+                "Rekening-courant inkoopvereniging": {}, 
+                "Rente": {}, 
+                "Sociale lasten 1": {}, 
+                "Stock Recieved niet gefactureerd": {
+                    "account_type": "Stock Received But Not Billed"
+                }, 
+                "Tanti\u00e8mes 1": {}, 
+                "Te vorderen Btw-verlegd": {
+                    "account_type": "Tax"
+                }, 
+                "Telefoon/telefax 1": {}, 
+                "Termijnen onderh. werk": {}, 
+                "Vakantiedagen": {}, 
+                "Vakantiegeld 1": {}, 
+                "Vakantiezegels": {}, 
+                "Vennootschapsbelasting": {}, 
+                "Vooruit ontvangen bedr.": {}
+            }, 
+            "LIQUIDE MIDDELEN": {
+                "ABN-AMRO bank": {}, 
+                "Bankbetaalkaarten": {}, 
+                "Effecten": {}, 
+                "Girobetaalkaarten": {}, 
+                "Kas": {
+                    "account_type": "Cash"
+                }, 
+                "Kas  valuta": {
+                    "account_type": "Cash"
+                }, 
+                "Kleine kas": {
+                    "account_type": "Cash"
+                }, 
+                "Kruisposten": {}, 
+                "Postbank": {
+                    "account_type": "Cash"
+                }, 
+                "account_type": "Cash"
+            }, 
+            "VORDERINGEN": {
+                "Debiteuren": {
+                    "account_type": "Receivable"
+                }, 
+                "Dubieuze debiteuren": {}, 
+                "Overige vorderingen": {}, 
+                "Rekening-courant directie 1": {}, 
+                "Te ontvangen ziekengeld": {}, 
+                "Voorschotten personeel": {}, 
+                "Vooruitbetaalde kosten": {}, 
+                "Voorziening dubieuze debiteuren": {}
+            }, 
+            "root_type": "Asset"
+        }, 
+        "INDIRECTE KOSTEN": {
+			"is_group": 1,
+            "root_type": "Expense"
+        }, 
+        "KOSTENREKENINGEN": {
+            "AFSCHRIJVINGEN": {
+                "Aanhangwagens": {}, 
+                "Aankoopkosten": {}, 
+                "Aanloopkosten": {}, 
+                "Auteursrechten": {}, 
+                "Bedrijfsgebouwen": {}, 
+                "Bedrijfsinventaris": {
+                    "account_type": "Depreciation"
+                }, 
+                "Drankvergunningen": {}, 
+                "Fabrieksinventaris": {
+                    "account_type": "Depreciation"
+                }, 
+                "Gebouwen": {}, 
+                "Gereedschappen": {}, 
+                "Goodwill": {}, 
+                "Grondverbetering": {}, 
+                "Heftrucks": {}, 
+                "Kantine-inventaris": {}, 
+                "Kantoorinventaris": {
+                    "account_type": "Depreciation"
+                }, 
+                "Kantoormachines": {}, 
+                "Licenties": {}, 
+                "Machines 1": {}, 
+                "Magazijninventaris": {}, 
+                "Octrooien": {}, 
+                "Ontwikkelingskosten": {}, 
+                "Pachtersinvestering": {}, 
+                "Parkeerplaats": {}, 
+                "Personenauto's": {
+                    "account_type": "Depreciation"
+                }, 
+                "Rijwielen en bromfietsen": {}, 
+                "Tonnagevergunningen": {}, 
+                "Verbouwingen": {}, 
+                "Vergunningen": {}, 
+                "Voorraadverschillen": {}, 
+                "Vrachtauto's": {}, 
+                "Winkels": {}, 
+                "Woon-winkelhuis": {}, 
+                "account_type": "Depreciation"
+            }, 
+            "ALGEMENE KOSTEN": {
+                "Accountantskosten": {}, 
+                "Advieskosten": {}, 
+                "Assuranties 1": {}, 
+                "Bankkosten": {}, 
+                "Juridische kosten": {}, 
+                "Overige algemene kosten": {}, 
+                "Toev. Ass. eigen risico": {}
+            }, 
+            "BEDRIJFSKOSTEN": {
+                "Assuranties 2": {}, 
+                "Energie (krachtstroom)": {}, 
+                "Gereedschappen 1": {}, 
+                "Hulpmaterialen 1": {}, 
+                "Huur inventaris": {}, 
+                "Huur machines": {}, 
+                "Leasing invent.operational": {}, 
+                "Leasing mach. operational": {}, 
+                "Onderhoud inventaris": {}, 
+                "Onderhoud machines": {}, 
+                "Ophalen/vervoer afval": {}, 
+                "Overige bedrijfskosten": {}
+            }, 
+            "FINANCIERINGSKOSTEN 1": {
+                "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 1": {}, 
+                "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 1": {}, 
+                "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": "Expense"
+        }, 
+        "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": "Asset"
+        }, 
+        "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 1": {}, 
+                    "Hypotheken o/g 1": {}, 
+                    "Hypotheken o/g 2": {}, 
+                    "Hypotheken o/g 3": {}, 
+                    "Hypotheken o/g 4": {}, 
+                    "Hypotheken o/g 5": {}, 
+                    "Lease-verplichtingen 1": {}, 
+                    "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": {}, 
+                    "account_type": "Stock"
+                }, 
+                "MACHINES": {
+                    "Aanschafwaarde Machines 1": {
+                        "account_type": "Fixed Asset"
+                    }, 
+                    "Aanschafwaarde Machines 2": {}, 
+                    "Aanschafwaarde Machines 3": {}, 
+                    "Aanschafwaarde Machines 4": {}, 
+                    "Aanschafwaarde Machines 5": {}, 
+                    "Afschrijving Machines 1": {
+                        "account_type": "Accumulated Depreciation"
+                    }, 
+                    "Afschrijving Machines 2": {}, 
+                    "Afschrijving Machines 3": {}, 
+                    "Afschrijving Machines 4": {}, 
+                    "Afschrijving Machines 5": {}, 
+                    "account_type": "Fixed Asset"
+                }
+            }, 
+            "ONROERENDE GOEDEREN": {
+                "Aanschafwaarde Aanloopkosten 1": {}, 
+                "Aanschafwaarde Bedrijfsgebouwen": {}, 
+                "Aanschafwaarde Gebouwen": {}, 
+                "Aanschafwaarde Grondverbetering": {}, 
+                "Aanschafwaarde Landerijen": {}, 
+                "Aanschafwaarde Ondergrond gebouwen": {}, 
+                "Aanschafwaarde Pachtersinvesteringen": {}, 
+                "Aanschafwaarde Parkeerplaats": {}, 
+                "Aanschafwaarde Verbouwingen": {}, 
+                "Aanschafwaarde Winkels": {}, 
+                "Aanschafwaarde Woon-winkelhuis": {}, 
+                "Afschrijving Aanloopkosten 1": {}, 
+                "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": "Asset"
+        }, 
+        "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": "Income"
+        }, 
+        "VOORRAAD GEREED PRODUCT EN ONDERHANDEN WERK": {
+            "Betalingskort. crediteuren": {}, 
+            "Garantiekosten": {}, 
+            "Hulpmaterialen": {}, 
+            "Inkomende vrachten": {
+                "account_type": "Expenses Included In Valuation"
+            }, 
+            "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": {
+                "account_type": "Cost of Goods Sold"
+            }, 
+            "Kostprijs omzet handelsgoederen": {}, 
+            "Onttrekking uitgev.garantie": {}, 
+            "Priv\u00e9-gebruik goederen": {}, 
+            "Stock aanpassing": {
+                "account_type": "Stock Adjustment"
+            }, 
+            "Tegenrekening inkoop": {}, 
+            "Toev. Voorz. incour. grondst.": {}, 
+            "Toevoeging garantieverpl.": {}, 
+            "Toevoeging voorz. incour. handelsgoed.": {}, 
+            "Uitbesteed werk": {}, 
+            "Voorz. Incourourant grondst.": {}, 
+            "Voorz.incour. handelsgoed.": {}, 
+            "root_type": "Expense"
+        }, 
+        "VOORRAAD GRONDSTOFFEN, HULPMATERIALEN EN HANDELSGOEDEREN": {
+            "Emballage": {}, 
+            "Gereed product 1": {}, 
+            "Gereed product 2": {}, 
+            "Goederen 1": {}, 
+            "Goederen 2": {}, 
+            "Goederen in consignatie": {}, 
+            "Goederen onderweg": {}, 
+            "Grondstoffen 1": {}, 
+            "Grondstoffen 2": {}, 
+            "Halffabrikaten 1": {}, 
+            "Halffabrikaten 2": {}, 
+            "Hulpstoffen 1": {}, 
+            "Hulpstoffen 2": {}, 
+            "Kantoorbenodigdheden": {}, 
+            "Onderhanden werk": {}, 
+            "Verpakkingsmateriaal": {}, 
+            "Zegels": {}, 
+            "root_type": "Asset"
+        }
+    }
+}

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

@@ -1,273 +1,311 @@
 {
-	"country_code": "sg",
-	"name": "Singapore - Chart of Accounts",
-	"tree": {
-		"Assets": {
-			"Current assets": {
-				"Accounts Receivable": {
-					"Credit Cards": {
-						"AMEX Receivable": {},
-						"CUP Receivale": {},
-						"MC Receivable": {},
-						"NETS Receivable": {},
-						"VISA Receivable": {}
-					},
-					"Debtors": {
-						"account_type": "Receivable"
-					}
-				},
-				"Bank Accounts": {
-					"Paypal Account": {
-						"account_type": "Bank"
-					},
-					"account_type": "Bank"
-				},
-				"Cash in Hand": {
-					"Cash in Transit": {
-						"account_type": "Cash"
-					},
-					"Petty Cash": {
-						"account_type": "Cash"
-					}
-				},
-				"Loans and Advances-Assets": {
-					"Prepayments": {}
-				},
-				"Securities and Deposits": {
-					"Bank Guarantees": {},
-					"Bank Deposits": {},
-					"Rental Deposits": {}
-				},
-				"Stock Assets": {
-					"account_type": "Stock",
-					"is_group": 1
-				},
-				"Tax Assets": {
-					"GST-Input": {}
-				}
-			},
-			"Non-current assets": {
-				"Fixed Assets": {
-					"Accumulated Depreciation": {
-						"AccDep-Equipment-ICT": {},
-						"AccDep-Furniture and Fixtures": {},
-						"AccDep-Equipment-Office": {},
-						"AccDep-Motor Vehicle": {},
-						"AccDep-Plant and Machinery": {}
-					},
-					"Equipment-ICT": {},
-					"Furniture and Fixtures": {},
-					"Equipment-Office": {},
-					"Motor Vehicle": {},
-					"Plant and Machinery": {}
-				},
-				"Non-Fixed Assets": {
-					"Goodwill": {},
-					"Investments": {
-						"Investments-Associated Company": {},
-						"Investments-Subsidiary": {}
-					}
-				},
-				"Shares": {
-					"Shares-Quoted": {},
-					"Shares-Unquoted": {}
-				}
-			},
-			"Temporary Accunts": {
-				"Temporary Opening": {
-					"account_type": "Temporary"
-				}
-			},
-			"root_type": "Asset"
-		},
-		"Liabilities": {
-			"Current liabilities": {
-				"Accounts Payable": {
-					"Creditors":{
-						"account_type": "Payable"
-					}
-			 	},
-			 	"Duties and Taxes": {
-					"account_type": "Tax",
-					"Deferred Tax Liabilities-Current": {},
-					"GST-Output": {},
-					"Income Tax Payable": {}
-				},
-				"Loans-Current": {
-					"Amount Owing to Directors": {},
-					"Bank Overdaft Account": {},
-					"Secured Loans": {},
-					"Unsecured Loans": {}
-				},
-				"Provision and Accruals": {
-					"Accruals": {
-					  "Accr-CPF": {},
-					  "Accr-Sundry": {},
-					  "Accr-Withholding Tax": {}
-					},
-					"Provisions": {
-						"Prov-Audit Fee": {},
-						"Prov-Others": {},
-						"Prov-Tax Fee": {},
-						"Prov-Bonus": {
-						  "Prov-Bonus-Executive": {},
-						  "Prov-Bonus-Non Executive": {}
-						}
-					}
-				},
-				"Sponsorship Funds": {},
-				"Stock Liabilities": {
-					"Stock Received But Not Billed": {
-					       "account_type": "Stock Received But Not Billed"
-					}
-				}
-			},
-			"Non-current liabilities": {
-				"Deferred Tax Liabilities": {},
-				"Loans-Non Current": {}
-			},
-			"Capital Account": {
-				"Reserves and Surplus": {},
-				"Shareholder Funds": {}
-			},
-		"root_type": "Liability"
-		},
-		"Equity": {
-			"Share Capital": {},
-			"Current Year Earnings": {},
-			"Proposed Dividends": {},
-			"Retained Earnings": {},
-			"root_type": "Equity"
-		},
-		"Income": {
-			"Direct Income": {
-				"Management Income": {},
-				"Sales Income": {}
-			},
-			"Indirect Income": {
-				"Government Grants": {},
-				"Interest Income": {
-			"Current Account Interest Earned": {},
-			"Fixed Deposit Interest Earned": {}
-				},
-				"Other Income": {},
-				"Service Charges": {}
-			},
-			"root_type": "Income"
-		},
-		"Expenses": {
-			"Expenses-Administrative": {
-				"Audit Fees": {},
-				"Bank charges and interest": {},
-				"Currency Exchange Differences": {},
-				"Insurance": {},
-				"Interest on Loan": {},
-				"Legal and Professional Fees": {},
-				"Loss on Disposal of FA": {},
-				"Postal and Courier Charges": {},
-				"Printing and Stationery": {},
-				"Secretarial Fees": {},
-				"Tax Agent Fees": {}
-			},
-			"Expenses-Direct": {
-				"Cost of Goods Sold": {
-					"account_type": "Cost of Goods Sold"
-				},
-				"Cost of Sales": {},
-				"Expenses Included in Valuation": {
-					"account_type": "Expenses Included In Valuation"
-				},
-				"Stock Adjustment": {
-					"account_type": "Stock Adjustment"
-				}
-			},
-			"Expenses-Marketing": {
-				"Advertising and Promotion": {},
-				"Graphic Design Fees": {},
-				"Internet Marketing": {}
-			},
-			"Expenses-Operating": {
-				"Cleaning Costs": {},
-				"Commission Charges": {
-					"Comm-Credit Card": {},
-					"Comm-NETS": {},
-					"Comm-Paypal": {}
-				},
-				"Communication Costs": {
-				  "Internet Connection": {},
-				  "Telephone Costs": {}
-				},
-				"Entertainment Expenses": {},
-				"General Expenses": {},
-			   "Licence Fees": {},
-			   "Rental Costs": {
-					"Rental-Premises": {},
-					"Rental-Equipment": {},
-					"Rental-Storage": {}
-				},
-				"Repairs and Maintenance": {
-					"R&M-ICT": {},
-					"R&M-Building": {},
-					"R&M-Fixtures & Furniture": {},
-					"R&M-Office": {},
-					"R&M-Plant & Machinery": {}
-				},
-				"Service Fees": {},
-				"Subscription Fees": {
-					"Publication Subscriptions": {},
-					"TV Subscriptions": {}
-				},
-				"Travel Expenses": {},
-				"Utilities": {
-					"Utility-Electricity": {},
-					"Utility-Gas": {},
-					"Utility-Refuse Removal": {},
-					"Utility-Water": {}
-				}
-			},
-			"Expenses-Other": {
-				"Bad Debts Written Off": {},
-				"Depreciation": {
-					"Dep-ICT Equipment": {},
-					"Dep-Fixtures & Furniture": {},
-					"Dep-Motor Vehicle": {},
-					"Dep-Office Equipment": {},
-					"Dep-Plant & Machinery": {},
-					"Dep-Renovation": {}
-				},
-				"Donations": {},
-				"Round Off": {},
-				"Tax Expenses": {
-					"Tax Expenses": {}
-				}
-			},
-			"Expenses-Staff": {
-				"Bonuses": {
-					"Bonus-Executive": {},
-					"Bonus-Non Executive": {},
-					"Bonus-Performance": {}
-				},
-				"CPF": {},
-				"Directors Fees": {},
-				"FWL": {},
-				"Incentives": {},
-				"Medical Expenses": {},
-				"Salaries": {
-					"Casual Labour": {},
-					"Salary-Executive": {},
-					"Salary-Non Executive-Full Time": {},
-					"Salary-Non Executive-Part Time": {}
-				},
-				"SDF": {},
-				"Security Expenses": {},
-				"Staff Advertising": {},
-				"Staff Commission Paid": {},
-				"Staff Meals": {},
-				"Staff Training": {},
-				"Staff Transport": {},
-				"Staff Welfare": {}
-			},
-			"root_type": "Expense"
-		}
-	}
+    "country_code": "sg", 
+    "name": "Singapore - Chart of Accounts", 
+    "tree": {
+        "Assets": {
+            "Current assets": {
+                "Accounts Receivable": {
+                    "Credit Cards": {
+                        "AMEX Receivable": {}, 
+                        "CUP Receivale": {}, 
+                        "MC Receivable": {}, 
+                        "NETS Receivable": {}, 
+                        "VISA Receivable": {}
+                    }, 
+                    "Debtors": {
+                        "account_type": "Receivable"
+                    }
+                }, 
+                "Bank Accounts": {
+                    "Paypal Account": {
+                        "account_type": "Bank"
+                    }, 
+                    "account_type": "Bank"
+                }, 
+                "Cash in Hand": {
+                    "Cash in Transit": {
+                        "account_type": "Cash"
+                    }, 
+                    "Petty Cash": {
+                        "account_type": "Cash"
+                    }, 
+                    "account_type": "Cash"
+                }, 
+                "Loans and Advances-Assets": {
+                    "Prepayments": {}
+                }, 
+                "Securities and Deposits": {
+                    "Bank Deposits": {}, 
+                    "Bank Guarantees": {}, 
+                    "Rental Deposits": {}
+                }, 
+                "Stock Assets": {
+                    "Stock in Hand": {
+                        "account_type": "Stock"
+                    }
+                }, 
+                "Tax Assets": {
+                    "GST-Input": {}
+                }
+            }, 
+            "Non-current assets": {
+                "Fixed Assets": {
+                    "Accumulated Depreciation": {
+                        "AccDep-Equipment-ICT": {
+                            "account_type": "Accumulated Depreciation"
+                        }, 
+                        "AccDep-Equipment-Office": {
+                            "account_type": "Accumulated Depreciation"
+                        }, 
+                        "AccDep-Furniture and Fixtures": {
+                            "account_type": "Accumulated Depreciation"
+                        }, 
+                        "AccDep-Motor Vehicle": {
+                            "account_type": "Accumulated Depreciation"
+                        }, 
+                        "AccDep-Plant and Machinery": {
+                            "account_type": "Accumulated Depreciation"
+                        }, 
+                        "account_type": "Accumulated Depreciation"
+                    }, 
+                    "Equipment-ICT": {
+                        "account_type": "Fixed Asset"
+                    }, 
+                    "Equipment-Office": {
+                        "account_type": "Fixed Asset"
+                    }, 
+                    "Furniture and Fixtures": {
+                        "account_type": "Fixed Asset"
+                    }, 
+                    "Motor Vehicle": {
+                        "account_type": "Fixed Asset"
+                    }, 
+                    "Plant and Machinery": {
+                        "account_type": "Fixed Asset"
+                    }, 
+                    "account_type": "Fixed Asset"
+                }, 
+                "Non-Fixed Assets": {
+                    "Goodwill": {}, 
+                    "Investments": {
+                        "Investments-Associated Company": {}, 
+                        "Investments-Subsidiary": {}
+                    }
+                }, 
+                "Shares": {
+                    "Shares-Quoted": {}, 
+                    "Shares-Unquoted": {}
+                }
+            }, 
+            "Temporary Accunts": {
+                "Temporary Opening": {
+                    "account_type": "Temporary"
+                }
+            }, 
+            "root_type": "Asset"
+        }, 
+        "Equity": {
+            "Current Year Earnings": {}, 
+            "Proposed Dividends": {}, 
+            "Retained Earnings": {}, 
+            "Share Capital": {}, 
+            "root_type": "Equity"
+        }, 
+        "Expenses": {
+            "Expenses-Administrative": {
+                "Audit Fees": {}, 
+                "Bank charges and interest": {}, 
+                "Currency Exchange Differences": {}, 
+                "Insurance": {}, 
+                "Interest on Loan": {}, 
+                "Legal and Professional Fees": {}, 
+                "Loss on Disposal of FA": {}, 
+                "Postal and Courier Charges": {}, 
+                "Printing and Stationery": {}, 
+                "Secretarial Fees": {}, 
+                "Tax Agent Fees": {}
+            }, 
+            "Expenses-Direct": {
+                "Cost of Goods Sold": {
+                    "account_type": "Cost of Goods Sold"
+                }, 
+                "Cost of Sales": {}, 
+                "Expenses Included in Valuation": {
+                    "account_type": "Expenses Included In Valuation"
+                }, 
+                "Stock Adjustment": {
+                    "account_type": "Stock Adjustment"
+                }
+            }, 
+            "Expenses-Marketing": {
+                "Advertising and Promotion": {}, 
+                "Graphic Design Fees": {}, 
+                "Internet Marketing": {}
+            }, 
+            "Expenses-Operating": {
+                "Cleaning Costs": {}, 
+                "Commission Charges": {
+                    "Comm-Credit Card": {}, 
+                    "Comm-NETS": {}, 
+                    "Comm-Paypal": {}
+                }, 
+                "Communication Costs": {
+                    "Internet Connection": {}, 
+                    "Telephone Costs": {}
+                }, 
+                "Entertainment Expenses": {}, 
+                "General Expenses": {}, 
+                "Licence Fees": {}, 
+                "Rental Costs": {
+                    "Rental-Equipment": {}, 
+                    "Rental-Premises": {}, 
+                    "Rental-Storage": {}
+                }, 
+                "Repairs and Maintenance": {
+                    "R&M-Building": {}, 
+                    "R&M-Fixtures & Furniture": {}, 
+                    "R&M-ICT": {}, 
+                    "R&M-Office": {}, 
+                    "R&M-Plant & Machinery": {}
+                }, 
+                "Service Fees": {}, 
+                "Subscription Fees": {
+                    "Publication Subscriptions": {}, 
+                    "TV Subscriptions": {}
+                }, 
+                "Travel Expenses": {}, 
+                "Utilities": {
+                    "Utility-Electricity": {}, 
+                    "Utility-Gas": {}, 
+                    "Utility-Refuse Removal": {}, 
+                    "Utility-Water": {}
+                }
+            }, 
+            "Expenses-Other": {
+                "Bad Debts Written Off": {}, 
+                "Depreciation": {
+                    "Dep-Fixtures & Furniture": {
+                        "account_type": "Depreciation"
+                    }, 
+                    "Dep-ICT Equipment": {
+                        "account_type": "Depreciation"
+                    }, 
+                    "Dep-Motor Vehicle": {
+                        "account_type": "Depreciation"
+                    }, 
+                    "Dep-Office Equipment": {
+                        "account_type": "Depreciation"
+                    }, 
+                    "Dep-Plant & Machinery": {
+                        "account_type": "Depreciation"
+                    }, 
+                    "Dep-Renovation": {
+                        "account_type": "Depreciation"
+                    }, 
+                    "account_type": "Depreciation"
+                }, 
+                "Donations": {}, 
+                "Round Off": {}, 
+                "Tax Expenses": {
+                    "Tax Expenses 1": {}
+                }
+            }, 
+            "Expenses-Staff": {
+                "Bonuses": {
+                    "Bonus-Executive": {}, 
+                    "Bonus-Non Executive": {}, 
+                    "Bonus-Performance": {}
+                }, 
+                "CPF": {}, 
+                "Directors Fees": {}, 
+                "FWL": {}, 
+                "Incentives": {}, 
+                "Medical Expenses": {}, 
+                "SDF": {}, 
+                "Salaries": {
+                    "Casual Labour": {}, 
+                    "Salary-Executive": {}, 
+                    "Salary-Non Executive-Full Time": {}, 
+                    "Salary-Non Executive-Part Time": {}
+                }, 
+                "Security Expenses": {}, 
+                "Staff Advertising": {}, 
+                "Staff Commission Paid": {}, 
+                "Staff Meals": {}, 
+                "Staff Training": {}, 
+                "Staff Transport": {}, 
+                "Staff Welfare": {}
+            }, 
+            "root_type": "Expense"
+        }, 
+        "Income": {
+            "Direct Income": {
+                "Management Income": {}, 
+                "Sales Income": {}
+            }, 
+            "Indirect Income": {
+                "Government Grants": {}, 
+                "Interest Income": {
+                    "Current Account Interest Earned": {}, 
+                    "Fixed Deposit Interest Earned": {}
+                }, 
+                "Other Income": {}, 
+                "Service Charges": {}
+            }, 
+            "root_type": "Income"
+        }, 
+        "Liabilities": {
+            "Capital Account": {
+                "Reserves and Surplus": {}, 
+                "Shareholder Funds": {}
+            }, 
+            "Current liabilities": {
+                "Accounts Payable": {
+                    "Creditors": {
+                        "account_type": "Payable"
+                    },
+					"Payroll Payable": {}
+                }, 
+                "Duties and Taxes": {
+                    "Deferred Tax Liabilities-Current": {}, 
+                    "GST-Output": {}, 
+                    "Income Tax Payable": {}, 
+                    "account_type": "Tax"
+                }, 
+                "Loans-Current": {
+                    "Amount Owing to Directors": {}, 
+                    "Bank Overdaft Account": {}, 
+                    "Secured Loans": {}, 
+                    "Unsecured Loans": {}
+                }, 
+                "Provision and Accruals": {
+                    "Accruals": {
+                        "Accr-CPF": {}, 
+                        "Accr-Sundry": {}, 
+                        "Accr-Withholding Tax": {}
+                    }, 
+                    "Provisions": {
+                        "Prov-Audit Fee": {}, 
+                        "Prov-Bonus": {
+                            "Prov-Bonus-Executive": {}, 
+                            "Prov-Bonus-Non Executive": {}
+                        }, 
+                        "Prov-Others": {}, 
+                        "Prov-Tax Fee": {}
+                    }
+                }, 
+                "Sponsorship Funds": {}, 
+                "Stock Liabilities": {
+                    "Stock Received But Not Billed": {
+                        "account_type": "Stock Received But Not Billed"
+                    }
+                }
+            }, 
+            "Non-current liabilities": {
+                "Deferred Tax Liabilities": {}, 
+                "Loans-Non Current": {}
+            }, 
+            "root_type": "Liability"
+        }
+    }
 }

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

@@ -28,7 +28,8 @@
 					},
 					"Petty Cash": {
 						"account_type": "Cash"
-					}
+					},
+					"account_type": "Cash"
 				},
 				"Loans and Advances-Assets": {
 					"Prepayments": {}
@@ -39,8 +40,9 @@
 					"Rental Deposits": {}
 				},
 				"Stock Assets": {
-					"account_type": "Stock",
-					"is_group": 1
+                    "Stock in Hand": {
+                        "account_type": "Stock"
+                    }
 				},
 				"Tax Assets": {
 					"GST-Input": {}
@@ -49,29 +51,73 @@
 			"Non-current assets": {
 				"Fixed Assets": {
 					"Accumulated Depreciation": {
-						"AccDep-Equipment-AV": {},
-						"AccDep-Equipment-Bar": {},
-						"AccDep-Equipment-ICT": {},
-						"AccDep-Equipment-Electrical": {},
-						"AccDep-Furniture and Fixtures": {},
-						"AccDep-Equipment-Kitchen": {},
-						"AccDep-Equipment-Lighting": {},
-						"AccDep-Equipment-Office": {},
-						"AccDep-Motor Vehicle": {},
-						"AccDep-Plant and Machinery": {},
-						"AccDep-Renovation": {}
+						"AccDep-Equipment-AV": {
+							"account_type": "Accumulated Depreciation"
+						},
+						"AccDep-Equipment-Bar": {
+							"account_type": "Accumulated Depreciation"
+						},
+						"AccDep-Equipment-ICT": {
+							"account_type": "Accumulated Depreciation"
+						},
+						"AccDep-Equipment-Electrical": {
+							"account_type": "Accumulated Depreciation"
+						},
+						"AccDep-Furniture and Fixtures": {
+							"account_type": "Accumulated Depreciation"
+						},
+						"AccDep-Equipment-Kitchen": {
+							"account_type": "Accumulated Depreciation"
+						},
+						"AccDep-Equipment-Lighting": {
+							"account_type": "Accumulated Depreciation"
+						},
+						"AccDep-Equipment-Office": {
+							"account_type": "Accumulated Depreciation"
+						},
+						"AccDep-Motor Vehicle": {
+							"account_type": "Accumulated Depreciation"
+						},
+						"AccDep-Plant and Machinery": {
+							"account_type": "Accumulated Depreciation"
+						},
+						"AccDep-Renovation": {
+							"account_type": "Accumulated Depreciation"
+						}
 					},
-					"Equipment-AV": {},
-					"Equipment-Bar": {},
-					"Equipment-ICT": {},
-					"Equipment-Electrical": {},
-					"Furniture and Fixtures": {},
-					"Equipment-Kitchen": {},
-					"Equipment-Lighting": {},
-					"Equipment-Office": {},
-					"Motor Vehicle": {},
-					"Plant and Machinery": {},
-					"Renovation": {}
+					"Equipment-AV": {
+						"account_type": "Fixed Asset"
+					},
+					"Equipment-Bar": {
+						"account_type": "Fixed Asset"
+					},
+					"Equipment-ICT": {
+						"account_type": "Fixed Asset"
+					},
+					"Equipment-Electrical": {
+						"account_type": "Fixed Asset"
+					},
+					"Furniture and Fixtures": {
+						"account_type": "Fixed Asset"
+					},
+					"Equipment-Kitchen": {
+						"account_type": "Fixed Asset"
+					},
+					"Equipment-Lighting": {
+						"account_type": "Fixed Asset"
+					},
+					"Equipment-Office": {
+						"account_type": "Fixed Asset"
+					},
+					"Motor Vehicle": {
+						"account_type": "Fixed Asset"
+					},
+					"Plant and Machinery": {
+						"account_type": "Fixed Asset"
+					},
+					"Renovation": {
+						"account_type": "Fixed Asset"
+					}
 				},
 				"Non-Fixed Assets": {
 					"Goodwill": {},
@@ -97,7 +143,8 @@
 				"Accounts Payable": {
 					"Creditors":{
 						"account_type": "Payable"
-					}
+					},
+					"Payroll Payable": {}
 			 	},
 			 	"Duties and Taxes": {
 					"account_type": "Tax",
@@ -292,22 +339,46 @@
 			"Expenses-Other": {
 				"Bad Debts Written Off": {},
 				"Depreciation": {
-					"Dep-AV Equipment": {},
-					"Dep-Bar Equipment": {},
-					"Dep-ICT Equipment": {},
-					"Dep-Electrical Equipment": {},
-					"Dep-Fixtures & Furniture": {},
-					"Dep-Kitchen Equipment": {},
-					"Dep-Lighting Equipment": {},
-					"Dep-Motor Vehicle": {},
-					"Dep-Office Equipment": {},
-					"Dep-Plant & Machinery": {},
-					"Dep-Renovation": {}
+					"Dep-AV Equipment": {
+						 "account_type": "Depreciation"
+					},
+					"Dep-Bar Equipment": {
+						 "account_type": "Depreciation"
+					},
+					"Dep-ICT Equipment": {
+						 "account_type": "Depreciation"
+					},
+					"Dep-Electrical Equipment": {
+						 "account_type": "Depreciation"
+					},
+					"Dep-Fixtures & Furniture": {
+						 "account_type": "Depreciation"
+					},
+					"Dep-Kitchen Equipment": {
+						 "account_type": "Depreciation"
+					},
+					"Dep-Lighting Equipment": {
+						 "account_type": "Depreciation"
+					},
+					"Dep-Motor Vehicle": {
+						 "account_type": "Depreciation"
+					},
+					"Dep-Office Equipment": {
+						 "account_type": "Depreciation"
+					},
+					"Dep-Plant & Machinery": {
+						 "account_type": "Depreciation"
+					},
+					"Dep-Renovation": {
+						 "account_type": "Depreciation"
+					}
 				},
 				"Donations": {},
-				"Round Off": {},
+				"Round Off": {
+					"account_type": "Round Off"
+				},
 				"Tax Expenses": {
-					"Tax Expenses": {}
+					"is_group": 1
 				}
 			},
 			"Expenses-Staff": {

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

@@ -30,8 +30,10 @@ def get():
 	                _("Earnest Money"): {}
 	            },
 	            _("Stock Assets"): {
+	                _("Stock In Hand"): {
+	                    "account_type": "Stock"
+	                },
 	                "account_type": "Stock",
-					"is_group": 1
 	            },
 	            _("Tax Assets"): {
 					"is_group": 1
@@ -107,7 +109,7 @@ def get():
 	            _("Office Maintenance Expenses"): {},
 	            _("Office Rent"): {},
 	            _("Postal Expenses"): {},
-	            _("Print and Stationary"): {},
+	            _("Print and Stationery"): {},
 	            _("Round Off"): {
 	                "account_type": "Round Off"
 	            },
@@ -137,7 +139,8 @@ def get():
 			    _("Accounts Payable"): {
 			        _("Creditors"): {
 			            "account_type": "Payable"
-			        }
+			        },
+			        _("Payroll Payable"): {},
 			    },
 			    _("Stock Liabilities"): {
 				    _("Stock Received But Not Billed"): {

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

@@ -0,0 +1,722 @@
+{
+    "country_code": "tw", 
+    "name": "Taiwan - Chart of Accounts", 
+    "tree": {
+        "1-\u8cc7\u7522": {
+            "11~12-\u6d41\u52d5\u8cc7\u7522": {
+                "111-\u73fe\u91d1\u53ca\u7d04\u7576\u73fe\u91d1": {
+                    "1111-\u5eab\u5b58\u73fe\u91d1": {
+                        "account_type": "Cash"
+                    },
+                    "1112-\u96f6\u7528\u91d1/\u9031\u8f49\u91d1": {
+                        "account_type": "Cash"
+                    },
+                    "1113-\u9280\u884c\u5b58\u6b3e": {
+                        "account_type": "Bank", 
+                        "\u4e2d\u570b\u4fe1\u8a17": {
+                            "account_type": "Bank"
+                        },
+                        "\u53f0\u5317\u5bcc\u90a6": {
+                            "account_type": "Bank"
+                        }
+                    },
+                    "1116-\u5728\u9014\u73fe\u91d1": {
+                        "account_type": "Cash"
+                    },
+                    "1117-\u7d04\u7576\u73fe\u91d1": {
+                        "account_type": "Cash"
+                    },
+                    "1118-\u5176\u4ed6\u73fe\u91d1\u53ca\u7d04\u7576\u73fe\u91d1": {
+                        "account_type": "Cash"
+                    },
+                    "account_type": "Cash"
+                },
+                "112-\u77ed\u671f\u6295\u8cc7": {
+                    "1121-\u77ed\u671f\u6295\u8cc7 \u2014\u80a1\u7968": {}
+                },
+                "113-\u61c9\u6536\u7968\u64da": {
+                    "1131-\u61c9\u6536\u7968\u64da": {
+                        "account_type": "Receivable"
+                    },
+                    "1132-\u61c9\u6536\u7968\u64da\u8cbc\u73fe ": {
+                        "account_type": "Receivable"
+                    },
+                    "1138-\u5176\u4ed6\u61c9\u6536\u7968\u64da ": {
+                        "account_type": "Receivable"
+                    },
+                    "1139-\u5099\u62b5\u5446\u5e33 \uff0d\u61c9\u6536\u7968\u64da ": {
+                        "account_type": "Receivable"
+                    },
+                    "account_type": "Receivable"
+                },
+                "114-\u61c9\u6536\u5e33\u6b3e": {
+                    "1141-\u61c9\u6536\u5e33\u6b3e ": {
+                        "account_type": "Receivable"
+                    },
+                    "1142-\u61c9\u6536\u5206\u671f\u5e33\u6b3e ": {
+                        "account_type": "Receivable"
+                    },
+                    "1149-\u5099\u62b5\u5446\u5e33 \uff0d\u61c9\u6536\u5e33\u6b3e ": {
+                        "account_type": "Receivable"
+                    },
+                    "account_type": "Receivable"
+                },
+                "118-\u5176\u4ed6\u61c9\u6536\u6b3e": {
+                    "1184-\u61c9\u6536\u6536\u76ca": {
+                        "account_type": "Receivable"
+                    },
+                    "1185-\u61c9\u6536\u9000\u7a05\u6b3e": {
+                        "account_type": "Receivable"
+                    },
+                    "1189-\u5099\u62b5\u5446\u5e33 \u2014 \u5176\u4ed6\u61c9\u6536\u6b3e ": {
+                        "account_type": "Receivable"
+                    },
+                    "account_type": "Receivable"
+                },
+                "121~122-\u5b58\u8ca8": {
+                    "1219-\u5099\u62b5\u5b58\u8ca8\u8dcc\u50f9\u640d\u5931": {},
+                    "1229-\u5099\u62b5\u5b58\u8ca8\u8dcc\u50f9\u640d\u5931": {},
+                    "account_type": "Stock", 
+                    "is_group": 1
+                },
+                "125-\u9810\u4ed8\u8cbb\u7528": {
+                    "1251-\u9810\u4ed8\u85aa\u8cc7": {},
+                    "1252-\u9810\u4ed8\u79df\u91d1": {},
+                    "1253-\u9810\u4ed8\u4fdd\u96aa\u8cbb": {},
+                    "1254-\u7528\u54c1\u76e4\u5b58": {},
+                    "1255-\u9810\u4ed8\u6240\u5f97\u7a05": {},
+                    "1258-\u5176\u4ed6\u9810\u4ed8\u8cbb\u7528": {}
+                },
+                "126-\u9810\u4ed8\u6b3e\u9805": {
+                    "1261-\u9810\u4ed8\u8ca8\u6b3e": {},
+                    "1268-\u5176\u4ed6\u9810\u4ed8\u6b3e\u9805": {}
+                },
+                "128~129-\u5176\u4ed6\u6d41\u52d5\u8cc7\u7522": {
+                    "1281-\u9032\u9805\u7a05\u984d": {},
+                    "1282-\u7559\u62b5\u7a05\u984d": {},
+                    "1283-\u66ab\u4ed8\u6b3e": {},
+                    "1284-\u4ee3\u4ed8\u6b3e": {},
+                    "1285-\u54e1\u5de5\u501f\u652f": {}
+                }
+            },
+            "13-\u57fa\u91d1\u53ca\u9577\u671f\u6295\u8cc7": {
+                "131-\u57fa\u91d1": {
+                    "1311-\u511f\u50b5\u57fa\u91d1": {},
+                    "1313-\u610f\u5916\u640d\u5931\u6e96\u5099\u57fa\u91d1": {},
+                    "1314-\u9000\u4f11\u57fa\u91d1": {},
+                    "1318-\u5176\u4ed6\u57fa\u91d1": {}
+                },
+                "132-\u9577\u671f\u6295\u8cc7": {
+                    "1321-\u9577\u671f\u80a1\u6b0a\u6295\u8cc7": {},
+                    "1322-\u9577\u671f\u50b5\u5238\u6295\u8cc7": {},
+                    "1323-\u9577\u671f\u4e0d\u52d5\u7522\u6295\u8cc7": {},
+                    "1328-\u5176\u4ed6\u9577\u671f\u6295\u8cc7": {}
+                }
+            },
+            "14~15-\u56fa\u5b9a\u8cc7\u7522": {
+                "141-\u571f\u5730": {
+                    "1411-\u571f\u5730": {
+                        "account_type": "Fixed Asset"
+                    },
+                    "account_type": "Fixed Asset"
+                },
+                "142-\u571f\u5730\u6539\u826f\u7269": {
+                    "1421-\u571f\u5730\u6539\u826f\u7269": {
+                        "account_type": "Fixed Asset"
+                    },
+                    "account_type": "Fixed Asset"
+                },
+                "143-\u623f\u5c4b\u53ca\u5efa\u7269": {
+                    "1431-\u623f\u5c4b\u53ca\u5efa\u7269": {
+                        "account_type": "Fixed Asset"
+                    },
+                    "account_type": "Fixed Asset"
+                },
+                "144~146-\u6a5f(\u5668)\u5177\u53ca\u8a2d\u5099": {
+                    "1441-\u6a5f(\u5668)\u5177": {
+                        "account_type": "Fixed Asset"
+                    },
+                    "account_type": "Fixed Asset"
+                },
+                "151-\u79df\u8cc3\u8cc7\u7522": {
+                    "1511-\u79df\u8cc3\u8cc7\u7522": {
+                        "account_type": "Fixed Asset"
+                    },
+                    "account_type": "Fixed Asset"
+                },
+                "152-\u79df\u8cc3\u6b0a\u76ca\u6539\u826f": {
+                    "1521-\u79df\u8cc3\u6b0a\u76ca\u6539\u826f": {
+                        "account_type": "Fixed Asset"
+                    },
+                    "account_type": "Fixed Asset"
+                },
+                "156-\u672a\u5b8c\u5de5\u7a0b\u53ca\u9810\u4ed8\u8cfc\u7f6e\u8a2d\u5099\u6b3e": {
+                    "1561-\u672a\u5b8c\u5de5\u7a0b": {
+                        "account_type": "Fixed Asset"
+                    },
+                    "account_type": "Fixed Asset"
+                },
+                "158-\u96dc\u9805\u56fa\u5b9a\u8cc7\u7522": {
+                    "1581-\u96dc\u9805\u56fa\u5b9a\u8cc7\u7522": {
+                        "account_type": "Fixed Asset"
+                    },
+                    "account_type": "Fixed Asset"
+                },
+                "account_type": "Fixed Asset"
+            },
+            "16-\u905e\u8017\u8cc7\u7522": {
+                "161-\u905e\u8017\u8cc7\u7522": {
+                    "is_group": 1
+                }
+            },
+            "17-\u7121\u5f62\u8cc7\u7522": {
+                "171-\u5546\u6a19\u6b0a": {
+                    "1711-\u5546\u6a19\u6b0a": {}
+                },
+                "172-\u5c08\u5229\u6b0a": {
+                    "1721-\u5c08\u5229\u6b0a": {}
+                },
+                "176-\u5546\u8b7d": {
+                    "1761-\u5546\u8b7d": {}
+                },
+                "177-\u958b\u8fa6\u8cbb": {
+                    "1771-\u958b\u8fa6\u8cbb": {}
+                },
+                "178-\u5176\u4ed6\u7121\u5f62\u8cc7\u7522": {
+                    "1781-\u905e\u5ef6\u9000\u4f11\u91d1\u6210\u672c": {}
+                }
+            },
+            "18-\u5176\u4ed6\u8cc7\u7522": {
+                "181-\u905e\u5ef6\u8cc7\u7522": {
+                    "1811-\u50b5\u5238\u767c\u884c\u6210\u672c": {},
+                    "1812-\u9577\u671f\u9810\u4ed8\u79df\u91d1": {},
+                    "1813-\u9577\u671f\u9810\u4ed8\u4fdd\u96aa\u8cbb": {},
+                    "1814-\u905e\u5ef6\u6240\u5f97\u7a05\u8cc7\u7522": {},
+                    "1815-\u9810\u4ed8\u9000\u4f11\u91d1": {},
+                    "1818-\u5176\u4ed6\u905e\u5ef6\u8cc7\u7522": {}
+                },
+                "182-\u9592\u7f6e\u8cc7\u7522": {
+                    "1821-\u9592\u7f6e\u8cc7\u7522": {}
+                },
+                "184-\u9577\u671f\u61c9\u6536\u7968\u64da\u53ca\u6b3e\u9805\u8207\u50ac\u6536\u5e33\u6b3e": {
+                    "1841-\u9577\u671f\u61c9\u6536\u7968\u64da": {
+                        "account_type": "Receivable"
+                    },
+                    "1842-\u9577\u671f\u61c9\u6536\u5e33\u6b3e": {
+                        "account_type": "Receivable"
+                    },
+                    "1843-\u50ac\u6536\u5e33\u6b3e": {
+                        "account_type": "Receivable"
+                    },
+                    "1848-\u5176\u4ed6\u9577\u671f\u61c9\u6536\u6b3e\u9805": {
+                        "account_type": "Receivable"
+                    },
+                    "1849-\u5099\u62b5\u5446\u5e33\u2014\u9577\u671f\u61c9\u6536\u7968\u64da\u53ca\u6b3e\u9805\u8207\u50ac\u6536\u5e33\u6b3e": {
+                        "account_type": "Receivable"
+                    },
+                    "account_type": "Receivable"
+                },
+                "185-\u51fa\u79df\u8cc7\u7522": {
+                    "1851-\u51fa\u79df\u8cc7\u7522": {},
+                    "1858-\u51fa\u79df\u8cc7\u7522 \u2014\u91cd\u4f30\u589e\u503c": {},
+                    "1859-\u7d2f\u7a4d\u6298\u820a \u2014\u51fa\u79df\u8cc7\u7522": {
+                        "account_type": "Accumulated Depreciation"
+                    }
+                },
+                "186-\u5b58\u51fa\u4fdd\u8b49\u91d1": {
+                    "1861-\u5b58\u51fa\u4fdd\u8b49\u91d1": {}
+                },
+                "188-\u96dc\u9805\u8cc7\u7522": {
+                    "1881-\u53d7\u9650\u5236\u5b58\u6b3e": {},
+                    "1888-\u96dc\u9805\u8cc7\u7522 \u2014\u5176\u4ed6": {}
+                }
+            },
+            "Temporary Accounts": {
+                "Temporary Opening": {
+                    "account_type": "Temporary"
+                },
+                "account_type": "Temporary"
+            },
+            "root_type": "Asset"
+        },
+        "2-\u8ca0\u50b5": {
+            "21~22-\u6d41\u52d5\u8ca0\u50b5": {
+                "211-\u77ed\u671f\u501f\u6b3e": {
+                    "2111-\u9280\u884c\u900f\u652f": {},
+                    "2112-\u9280\u884c\u501f\u6b3e": {}
+                },
+                "212-\u61c9\u4ed8\u77ed\u671f\u7968\u5238": {
+                    "2121-\u61c9\u4ed8\u5546\u696d\u672c\u7968": {
+                        "account_type": "Payable"
+                    },
+                    "2122-\u9280\u884c\u627f\u514c\u532f\u7968": {
+                        "account_type": "Payable"
+                    },
+                    "account_type": "Payable"
+                },
+                "213-\u61c9\u4ed8\u7968\u64da": {
+                    "2131-\u61c9\u4ed8\u7968\u64da": {
+                        "account_type": "Payable"
+                    },
+                    "account_type": "Payable"
+                },
+                "214-\u61c9\u4ed8\u5e33\u6b3e": {
+                    "2141-\u61c9\u4ed8\u5e33\u6b3e": {
+                        "account_type": "Payable"
+                    },
+                    "account_type": "Payable"
+                },
+                "216-\u61c9\u4ed8\u6240\u5f97\u7a05": {
+                    "2161-\u61c9\u4ed8\u6240\u5f97\u7a05": {
+                        "account_type": "Tax", 
+                        "tax_rate": 5.0
+                    },
+                    "account_type": "Tax", 
+                    "tax_rate": 5.0
+                },
+                "217-\u61c9\u4ed8\u8cbb\u7528": {
+                    "2171-\u61c9\u4ed8\u85aa\u5de5": {},
+                    "2172-\u61c9\u4ed8\u79df\u91d1": {},
+                    "2173-\u61c9\u4ed8\u5229\u606f": {},
+                    "2174-\u61c9\u4ed8\u71df\u696d\u7a05": {},
+                    "2175-\u61c9\u4ed8\u7a05\u6350 \u2014\u5176\u4ed6": {
+                        "account_type": "Tax", 
+                        "tax_rate": 5.0
+                    },
+                    "2178-\u5176\u4ed6\u61c9\u4ed8\u8cbb\u7528": {}
+                },
+                "218~219-\u5176\u4ed6\u61c9\u4ed8\u6b3e": {
+                    "2184-\u61c9\u4ed8\u571f\u5730\u623f\u5c4b\u6b3e": {},
+                    "2185-\u61c9\u4ed8\u8a2d\u5099\u6b3e": {},
+                    "2192-\u61c9\u4ed8\u80a1\u5229": {}
+                },
+                "226-\u9810\u6536\u6b3e\u9805": {
+                    "2261-\u9810\u6536\u8ca8\u6b3e": {},
+                    "2262-\u9810\u6536\u6536\u5165": {},
+                    "2268-\u5176\u4ed6\u9810\u6536\u6b3e": {}
+                },
+                "227-\u4e00\u5e74\u6216\u4e00\u71df\u696d\u9031\u671f\u5167\u5230\u671f\u9577\u671f\u8ca0\u50b5": {
+                    "is_group": 1
+                },
+                "228~229-\u5176\u4ed6\u6d41\u52d5\u8ca0\u50b5": {
+                    "2281-\u92b7\u9805\u7a05\u984d": {},
+                    "2283-\u66ab\u6536\u6b3e ": {},
+                    "2284-\u4ee3\u6536\u6b3e": {},
+                    "2285-\u4f30\u8a08\u552e\u5f8c\u670d\u52d9/\u4fdd\u56fa\u8ca0\u50b5": {},
+                    "2291-\u905e\u5ef6\u6240\u5f97\u7a05\u8ca0\u50b5": {},
+                    "2292-\u905e\u5ef6\u514c\u63db\u5229\u76ca": {}
+                }
+            },
+            "23-\u9577\u671f\u8ca0\u50b5": {
+                "231-\u61c9\u4ed8\u516c\u53f8\u50b5": {
+                    "2311-\u61c9\u4ed8\u516c\u53f8\u50b5": {},
+                    "2319-\u61c9\u4ed8\u516c\u53f8\u50b5\u6ea2(\u6298)\u50f9": {}
+                },
+                "232-\u9577\u671f\u501f\u6b3e": {
+                    "2321-\u9577\u671f\u9280\u884c\u501f\u6b3e": {},
+                    "2324-\u9577\u671f\u501f\u6b3e \u2014\u696d\u4e3b": {},
+                    "2325-\u9577\u671f\u501f\u6b3e \u2014\u54e1\u5de5": {},
+                    "2327-\u9577\u671f\u501f\u6b3e \u2014\u95dc\u4fc2\u4eba": {},
+                    "2328-\u9577\u671f\u501f\u6b3e \u2014\u5176\u4ed6": {}
+                },
+                "233-\u9577\u671f\u61c9\u4ed8\u7968\u64da\u53ca\u6b3e\u9805": {
+                    "2331-\u9577\u671f\u61c9\u4ed8\u7968\u64da": {
+                        "account_type": "Payable"
+                    },
+                    "2332-\u9577\u671f\u61c9\u4ed8\u5e33\u6b3e": {
+                        "account_type": "Payable"
+                    },
+                    "2333-\u9577\u671f\u61c9\u4ed8\u79df\u8cc3\u8ca0\u50b5": {
+                        "account_type": "Payable"
+                    },
+                    "account_type": "Payable"
+                },
+                "234-\u4f30\u8a08\u61c9\u4ed8\u571f\u5730\u589e\u503c\u7a05": {
+                    "2341-\u4f30\u8a08\u61c9\u4ed8\u571f\u5730\u589e\u503c\u7a05": {}
+                },
+                "235-\u61c9\u8a08\u9000\u4f11\u91d1\u8ca0\u50b5": {
+                    "2351-\u61c9\u8a08\u9000\u4f11\u91d1\u8ca0\u50b5": {}
+                },
+                "238-\u5176\u4ed6\u9577\u671f\u8ca0\u50b5": {
+                    "2388-\u5176\u4ed6\u9577\u671f\u8ca0\u50b5\u2014\u5176\u4ed6": {}
+                }
+            },
+            "28-\u5176\u4ed6\u8ca0\u50b5": {
+                "281-\u905e\u5ef6\u8ca0\u50b5": {
+                    "2811-\u905e\u5ef6\u6536\u5165": {},
+                    "2814-\u905e\u5ef6\u6240\u5f97\u7a05\u8ca0\u50b5": {},
+                    "2818-\u5176\u4ed6\u905e\u5ef6\u8ca0\u50b5": {}
+                },
+                "286-\u5b58\u5165\u4fdd\u8b49\u91d1": {
+                    "2861-\u5b58\u5165\u4fdd\u8b49\u91d1": {}
+                },
+                "288-\u96dc\u9805\u8ca0\u50b5": {
+                    "2888-\u96dc\u9805\u8ca0\u50b5 \u2014\u5176\u4ed6": {}
+                }
+            },
+            "Stock Received But Not Billed": {
+                "account_type": "Stock Received But Not Billed"
+            },
+            "root_type": "Liability"
+        },
+        "3-\u696d\u4e3b\u6b0a\u76ca": {
+            "31-\u8cc7\u672c": {
+                "311-\u8cc7\u672c\uff08\u80a1\u672c\uff09 ": {
+                    "3111-\u666e\u901a\u80a1\u80a1\u672c": {},
+                    "3112-\u7279\u5225\u80a1\u80a1\u672c": {},
+                    "3113-\u9810\u6536\u80a1\u672c": {},
+                    "3114-\u5f85\u5206\u914d\u80a1\u7968\u80a1\u5229": {},
+                    "3115-\u8cc7\u672c": {}
+                }
+            },
+            "32-\u8cc7\u672c\u516c\u7a4d": {
+                "321-\u80a1\u7968\u6ea2\u50f9": {
+                    "3211-\u666e\u901a\u80a1\u80a1\u7968\u6ea2\u50f9": {},
+                    "3212-\u7279\u5225\u80a1\u80a1\u7968\u6ea2\u50f9": {}
+                },
+                "323-\u8cc7\u7522\u91cd\u4f30\u589e\u503c\u6e96\u5099": {
+                    "3231-\u8cc7\u7522\u91cd\u4f30\u589e\u503c\u6e96\u5099": {}
+                },
+                "324-\u8655\u5206\u8cc7\u7522\u6ea2\u50f9\u516c\u7a4d": {
+                    "3241-\u8655\u5206\u8cc7\u7522\u6ea2\u50f9\u516c\u7a4d": {}
+                },
+                "325-\u5408\u4f75\u516c\u7a4d": {
+                    "3251-\u5408\u4f75\u516c\u7a4d": {}
+                },
+                "326-\u53d7\u8d08\u516c\u7a4d": {
+                    "3261-\u53d7\u8d08\u516c\u7a4d": {}
+                },
+                "328-\u5176\u4ed6\u8cc7\u672c\u516c\u7a4d": {
+                    "3281-\u6b0a\u76ca\u6cd5\u9577\u671f\u80a1\u6b0a\u6295\u8cc7\u8cc7\u672c\u516c\u7a4d": {},
+                    "3282-\u8cc7\u672c\u516c\u7a4d\u2014 \u5eab\u85cf\u80a1\u7968\u4ea4\u6613": {}
+                }
+            },
+            "33-\u4fdd\u7559\u76c8\u9918(\u7d2f\u7a4d\u8667\u640d)": {
+                "331-\u6cd5\u5b9a\u76c8\u9918\u516c\u7a4d": {
+                    "3311-\u6cd5\u5b9a\u76c8\u9918\u516c\u7a4d": {}
+                },
+                "332-\u7279\u5225\u76c8\u9918\u516c\u7a4d": {
+                    "3321-\u610f\u5916\u640d\u5931\u6e96\u5099": {},
+                    "3322-\u6539\u826f\u64f4\u5145\u6e96\u5099": {},
+                    "3323-\u511f\u50b5\u6e96\u5099": {},
+                    "3328-\u5176\u4ed6\u7279\u5225\u76c8\u9918\u516c\u7a4d": {}
+                },
+                "335-\u672a\u5206\u914d\u76c8\u9918(\u7d2f\u7a4d\u8667\u640d) ": {
+                    "is_group": 1
+                }
+            },
+            "34-\u6b0a\u76ca\u8abf\u6574": {
+                "341-\u9577\u671f\u80a1\u6b0a\u6295\u8cc7\u672a\u5be6\u73fe\u8dcc\u50f9\u640d\u5931": {
+                    "3411-\u9577\u671f\u80a1\u6b0a\u6295\u8cc7\u672a\u5be6\u73fe\u8dcc\u50f9\u640d\u5931": {}
+                },
+                "342-\u7d2f\u7a4d\u63db\u7b97\u8abf\u6574\u6578": {
+                    "3421-\u7d2f\u7a4d\u63db\u7b97\u8abf\u6574\u6578": {}
+                },
+                "343-\u672a\u8a8d\u5217\u70ba\u9000\u4f11\u91d1\u6210\u672c\u4e4b\u6de8\u640d\u5931": {
+                    "3431-\u672a\u8a8d\u5217\u70ba\u9000\u4f11\u91d1\u6210\u672c\u4e4b\u6de8\u640d\u5931": {}
+                }
+            },
+            "35-\u5eab\u85cf\u80a1": {
+                "351-\u5eab\u85cf\u80a1": {
+                    "3511-\u5eab\u85cf\u80a1": {}
+                }
+            },
+            "36-\u5c11\u6578\u80a1\u6b0a": {
+                "361-\u5c11\u6578\u80a1\u6b0a": {
+                    "3611-\u5c11\u6578\u80a1\u6b0a": {}
+                }
+            },
+            "root_type": "Equity"
+        },
+        "4-\u71df\u696d\u6536\u5165": {
+            "41-\u92b7\u8ca8\u6536\u5165": {
+                "411-\u92b7\u8ca8\u6536\u5165": {
+                    "4111-\u92b7\u8ca8\u6536\u5165": {},
+                    "4112-\u5206\u671f\u4ed8\u6b3e\u92b7\u8ca8\u6536\u5165": {}
+                },
+                "417-\u92b7\u8ca8\u9000\u56de": {
+                    "4171-\u92b7\u8ca8\u9000\u56de": {}
+                },
+                "419-\u92b7\u8ca8\u6298\u8b93": {
+                    "4191-\u92b7\u8ca8\u6298\u8b93": {}
+                }
+            },
+            "46-\u52de\u52d9\u6536\u5165": {
+                "461-\u52de\u52d9\u6536\u5165": {
+                    "4611-\u52de\u52d9\u6536\u5165": {}
+                }
+            },
+            "47-\u696d\u52d9\u6536\u5165": {
+                "471-\u696d\u52d9\u6536\u5165": {
+                    "4711-\u696d\u52d9\u6536\u5165": {}
+                }
+            },
+            "48-\u5176\u4ed6\u71df\u696d\u6536\u5165": {
+                "488-\u5176\u4ed6\u71df\u696d\u6536\u5165\u2014\u5176\u4ed6": {
+                    "4888-\u5176\u4ed6\u71df\u696d\u6536\u5165\u2014\u5176\u4ed6": {}
+                }
+            },
+            "root_type": "Income"
+        },
+        "5-\u71df\u696d\u6210\u672c": {
+            "51-\u92b7\u8ca8\u6210\u672c": {
+                "511-\u92b7\u8ca8\u6210\u672c": {
+                    "5111-\u92b7\u8ca8\u6210\u672c": {
+                        "account_type": "Cost of Goods Sold"
+                    },
+                    "5112-\u5206\u671f\u4ed8\u6b3e\u92b7\u8ca8\u6210\u672c": {
+                        "account_type": "Cost of Goods Sold"
+                    },
+                    "account_type": "Cost of Goods Sold"
+                },
+                "512-\u9032\u8ca8": {
+                    "5121-\u9032\u8ca8": {},
+                    "5122-\u9032\u8ca8\u8cbb\u7528": {},
+                    "5123-\u9032\u8ca8\u9000\u51fa": {},
+                    "5124-\u9032\u8ca8\u6298\u8b93": {}
+                },
+                "513-\u9032\u6599": {
+                    "5131-\u9032\u6599": {},
+                    "5132-\u9032\u6599\u8cbb\u7528": {},
+                    "5133-\u9032\u6599\u9000\u51fa": {},
+                    "5134-\u9032\u6599\u6298\u8b93": {}
+                },
+                "514-\u76f4\u63a5\u4eba\u5de5": {
+                    "5141-\u76f4\u63a5\u4eba\u5de5": {}
+                },
+                "515~518-\u88fd\u9020\u8cbb\u7528": {
+                    "5151-\u9593\u63a5\u4eba\u5de5": {},
+                    "5152-\u79df\u91d1\u652f\u51fa": {},
+                    "5153-\u6587\u5177\u7528\u54c1": {},
+                    "5154-\u65c5\u8cbb": {},
+                    "5155-\u904b\u8cbb": {},
+                    "5156-\u90f5\u96fb\u8cbb": {},
+                    "5157-\u4fee\u7e55\u8cbb": {},
+                    "5158-\u5305\u88dd\u8cbb": {},
+                    "5161-\u6c34\u96fb\u74e6\u65af\u8cbb": {},
+                    "5162-\u4fdd\u96aa\u8cbb": {},
+                    "5163-\u52a0\u5de5\u8cbb": {},
+                    "5166-\u7a05\u6350": {
+                        "account_type": "Tax", 
+                        "tax_rate": 5.0
+                    },
+                    "5168-\u6298\u820a ": {
+                        "account_type": "Depreciation"
+                    },
+                    "5169-\u5404\u9805\u8017\u7aed\u53ca\u6524\u63d0": {},
+                    "5172-\u4f19\u98df\u8cbb": {},
+                    "5173-\u8077\u5de5\u798f\u5229": {},
+                    "5176-\u8a13\u7df4\u8cbb": {},
+                    "5177-\u9593\u63a5\u6750\u6599": {},
+                    "5188-\u5176\u4ed6\u88fd\u9020\u8cbb\u7528": {}
+                },
+                "Expenses Included In Valuation": {
+                    "account_type": "Expenses Included In Valuation"
+                },
+                "account_type": "Cost of Goods Sold"
+            },
+            "56-\u52de\u52d9\u6210\u672c\u88fd": {
+                "561-\u52de\u52d9\u6210\u672c": {
+                    "5611-\u52de\u52d9\u6210\u672c": {}
+                }
+            },
+            "57-\u696d\u52d9\u6210\u672c": {
+                "571-\u696d\u52d9\u6210\u672c": {
+                    "5711-\u696d\u52d9\u6210\u672c": {}
+                }
+            },
+            "58-\u5176\u4ed6\u71df\u696d\u6210\u672c": {
+                "588-\u5176\u4ed6\u71df\u696d\u6210\u672c\u2014\u5176\u4ed6 ": {
+                    "5888-\u5176\u4ed6\u71df\u696d\u6210\u672c\u2014\u5176\u4ed6": {}
+                }
+            },
+            "Stock Adjustment": {
+                "account_type": "Stock Adjustment"
+            },
+            "root_type": "Expense"
+        },
+        "6-\u71df\u696d\u8cbb\u7528": {
+            "61-\u63a8\u92b7\u8cbb\u7528": {
+                "615~618-\u63a8\u92b7\u8cbb\u7528": {
+                    "6151-\u85aa\u8cc7\u652f\u51fa": {},
+                    "6152-\u79df\u91d1\u652f\u51fa": {},
+                    "6153-\u6587\u5177\u7528\u54c1": {},
+                    "6154-\u65c5\u8cbb": {},
+                    "6155-\u904b\u8cbb": {},
+                    "6156-\u90f5\u96fb\u8cbb": {},
+                    "6157-\u4fee\u7e55\u8cbb": {},
+                    "6159-\u5ee3\u544a\u8cbb": {},
+                    "6161-\u6c34\u96fb\u74e6\u65af\u8cbb": {},
+                    "6162-\u4fdd\u96aa\u8cbb": {},
+                    "6164-\u4ea4\u969b\u8cbb": {},
+                    "6165-\u6350\u8d08": {},
+                    "6166-\u7a05\u6350": {
+                        "account_type": "Tax", 
+                        "tax_rate": 5.0
+                    },
+                    "6167-\u5446\u5e33\u640d\u5931": {},
+                    "6168-\u6298\u820a ": {
+                        "account_type": "Depreciation"
+                    },
+                    "6169-\u5404\u9805\u8017\u7aed\u53ca\u6524\u63d0": {},
+                    "6172-\u4f19\u98df\u8cbb": {},
+                    "6173-\u8077\u5de5\u798f\u5229": {},
+                    "6175-\u4f63\u91d1\u652f\u51fa": {},
+                    "6176-\u8a13\u7df4\u8cbb": {},
+                    "6188-\u5176\u4ed6\u63a8\u92b7\u8cbb\u7528": {}
+                }
+            },
+            "62-\u7ba1\u7406\u53ca\u7e3d\u52d9\u8cbb\u7528": {
+                "625~628-\u7ba1\u7406\u53ca\u7e3d\u52d9\u8cbb\u7528": {
+                    "6251-\u85aa\u8cc7\u652f\u51fa": {},
+                    "6252-\u79df\u91d1\u652f\u51fa": {},
+                    "6253-\u6587\u5177\u7528\u54c1": {},
+                    "6254-\u65c5\u8cbb": {},
+                    "6255-\u904b\u8cbb": {},
+                    "6256-\u90f5\u96fb\u8cbb": {},
+                    "6257-\u4fee\u7e55\u8cbb": {},
+                    "6259-\u5ee3\u544a\u8cbb": {},
+                    "6261-\u6c34\u96fb\u74e6\u65af\u8cbb": {},
+                    "6262-\u4fdd\u96aa\u8cbb": {},
+                    "6264-\u4ea4\u969b\u8cbb": {},
+                    "6265-\u6350\u8d08": {},
+                    "6266-\u7a05\u6350": {
+                        "account_type": "Tax", 
+                        "tax_rate": 5.0
+                    },
+                    "6267-\u5446\u5e33\u640d\u5931": {},
+                    "6268-\u6298\u820a": {
+                        "account_type": "Depreciation"
+                    },
+                    "6269-\u5404\u9805\u8017\u7aed\u53ca\u6524\u63d0": {},
+                    "6271-\u5916\u92b7\u640d\u5931": {},
+                    "6272-\u4f19\u98df\u8cbb": {},
+                    "6273-\u8077\u5de5\u798f\u5229": {},
+                    "6274-\u7814\u7a76\u767c\u5c55\u8cbb\u7528": {},
+                    "6275-\u4f63\u91d1\u652f\u51fa": {},
+                    "6276-\u8a13\u7df4\u8cbb": {},
+                    "6278-\u52de\u52d9\u8cbb": {},
+                    "6288-\u5176\u4ed6\u7ba1\u7406\u53ca\u7e3d\u52d9\u8cbb\u7528": {}
+                }
+            },
+            "63-\u7814\u7a76\u767c\u5c55\u8cbb\u7528": {
+                "635~638-\u7814\u7a76\u767c\u5c55\u8cbb\u7528": {
+                    "6351-\u85aa\u8cc7\u652f\u51fa": {},
+                    "6352-\u79df\u91d1\u652f\u51fa": {},
+                    "6353-\u6587\u5177\u7528\u54c1": {},
+                    "6354-\u65c5\u8cbb": {},
+                    "6355-\u904b\u8cbb": {},
+                    "6356-\u90f5\u96fb\u8cbb": {},
+                    "6357-\u4fee\u7e55\u8cbb": {},
+                    "6361-\u6c34\u96fb\u74e6\u65af\u8cbb": {},
+                    "6362-\u4fdd\u96aa\u8cbb": {},
+                    "6364-\u4ea4\u969b\u8cbb": {},
+                    "6366-\u7a05\u6350": {
+                        "account_type": "Tax", 
+                        "tax_rate": 5.0
+                    },
+                    "6368-\u6298\u820a": {
+                        "account_type": "Depreciation"
+                    },
+                    "6369-\u5404\u9805\u8017\u7aed\u53ca\u6524\u63d0": {},
+                    "6372-\u4f19\u98df\u8cbb": {},
+                    "6373-\u8077\u5de5\u798f\u5229": {},
+                    "6376-\u8a13\u7df4\u8cbb": {},
+                    "6378-\u5176\u4ed6\u7814\u7a76\u767c\u5c55\u8cbb\u7528": {}
+                }
+            },
+            "root_type": "Expense"
+        },
+        "7-\u71df\u696d\u5916\u6536\u5165\u53ca\u8cbb\u7528": {
+            "71~74-\u71df\u696d\u5916\u6536\u5165": {
+                "711-\u5229\u606f\u6536\u5165": {
+                    "7111-\u5229\u606f\u6536\u5165": {}
+                },
+                "712-\u6295\u8cc7\u6536\u76ca": {
+                    "7121-\u6b0a\u76ca\u6cd5\u8a8d\u5217\u4e4b\u6295\u8cc7\u6536\u76ca": {},
+                    "7122-\u80a1\u5229\u6536\u5165": {},
+                    "7123-\u77ed\u671f\u6295\u8cc7\u5e02\u50f9\u56de\u5347\u5229\u76ca": {}
+                },
+                "713-\u514c\u63db\u5229\u76ca": {
+                    "7131-\u514c\u63db\u5229\u76ca": {}
+                },
+                "714-\u8655\u5206\u6295\u8cc7\u6536\u76ca": {
+                    "7141-\u8655\u5206\u6295\u8cc7\u6536\u76ca": {}
+                },
+                "715-\u8655\u5206\u8cc7\u7522\u6ea2\u50f9\u6536\u5165": {
+                    "7151-\u8655\u5206\u8cc7\u7522\u6ea2\u50f9\u6536\u5165": {}
+                },
+                "748-\u5176\u4ed6\u71df\u696d\u5916\u6536\u5165": {
+                    "7481-\u6350\u8d08\u6536\u5165": {},
+                    "7482-\u79df\u91d1\u6536\u5165": {},
+                    "7483-\u4f63\u91d1\u6536\u5165": {},
+                    "7484-\u51fa\u552e\u4e0b\u8173\u53ca\u5ee2\u6599\u6536\u5165": {},
+                    "7485-\u5b58\u8ca8\u76e4\u76c8": {},
+                    "7486-\u5b58\u8ca8\u8dcc\u50f9\u56de\u5347\u5229\u76ca": {},
+                    "7487-\u58de\u5e33\u8f49\u56de\u5229\u76ca": {},
+                    "7488-\u5176\u4ed6\u71df\u696d\u5916\u6536\u5165\u2014\u5176\u4ed6": {}
+                }
+            },
+            "75~78-\u71df\u696d\u5916\u8cbb\u7528": {
+                "751-\u5229\u606f\u8cbb\u7528": {
+                    "7511-\u5229\u606f\u8cbb\u7528": {}
+                },
+                "752-\u6295\u8cc7\u640d\u5931": {
+                    "7521-\u6b0a\u76ca\u6cd5\u8a8d\u5217\u4e4b\u6295\u8cc7\u640d\u5931": {},
+                    "7523-\u77ed\u671f\u6295\u8cc7\u672a\u5be6\u73fe\u8dcc\u50f9\u640d\u5931": {}
+                },
+                "753-\u514c\u63db\u640d\u5931": {
+                    "7531-\u514c\u63db\u640d\u5931": {}
+                },
+                "754-\u8655\u5206\u6295\u8cc7\u640d\u5931": {
+                    "7541-\u8655\u5206\u6295\u8cc7\u640d\u5931": {}
+                },
+                "755-\u8655\u5206\u8cc7\u7522\u640d\u5931": {
+                    "7551-\u8655\u5206\u8cc7\u7522\u640d\u5931 ": {}
+                },
+                "788-\u5176\u4ed6\u71df\u696d\u5916\u8cbb\u7528": {
+                    "7881-\u505c\u5de5\u640d\u5931": {},
+                    "7882-\u707d\u5bb3\u640d\u5931": {},
+                    "7885-\u5b58\u8ca8\u76e4\u640d": {},
+                    "7886-\u5b58\u8ca8\u8dcc\u50f9\u53ca\u5446\u6eef\u640d\u5931": {},
+                    "7888-\u5176\u4ed6\u71df\u696d\u5916\u8cbb\u7528\u2014\u5176\u4ed6": {}
+                }
+            },
+            "root_type": "Income"
+        },
+        "8-\u6240\u5f97\u7a05\u8cbb\u7528(\u5229\u76ca)": {
+            "81-\u6240\u5f97\u7a05\u8cbb\u7528(\u5229\u76ca)": {
+                "811-\u6240\u5f97\u7a05\u8cbb\u7528(\u5229\u76ca) ": {
+                    "8111-\u6240\u5f97\u7a05\u8cbb\u7528(\u5229\u76ca) ": {}
+                }
+            },
+            "root_type": "Expense"
+        },
+        "9-\u975e\u7d93\u5e38\u71df\u696d\u640d\u76ca": {
+            "91-\u505c\u696d\u90e8\u9580\u640d\u76ca": {
+                "911-\u505c\u696d\u90e8\u9580\u640d\u76ca\u2014\u505c\u696d\u524d\u71df\u696d\u640d\u76ca": {
+                    "9111-\u505c\u696d\u90e8\u9580\u640d\u76ca\u2014\u505c\u696d\u524d\u71df\u696d\u640d\u76ca": {}
+                },
+                "912-\u505c\u696d\u90e8\u9580\u640d\u76ca\u2014\u8655\u5206\u640d\u76ca": {
+                    "9121-\u505c\u696d\u90e8\u9580\u640d\u76ca\u2014\u8655\u5206\u640d\u76ca": {}
+                }
+            },
+            "92-\u975e\u5e38\u640d\u76ca": {
+                "921-\u975e\u5e38\u640d\u76ca": {
+                    "9211-\u975e\u5e38\u640d\u76ca": {}
+                }
+            },
+            "93-\u6703\u8a08\u539f\u5247\u8b8a\u52d5\u7d2f\u7a4d\u5f71\u97ff\u6578": {
+                "931-\u6703\u8a08\u539f\u5247\u8b8a\u52d5\u7d2f\u7a4d\u5f71\u97ff\u6578": {
+                    "9311-\u6703\u8a08\u539f\u5247\u8b8a\u52d5\u7d2f\u7a4d\u5f71\u97ff\u6578": {}
+                }
+            },
+            "94-\u5c11\u6578\u80a1\u6b0a\u6de8\u5229": {
+                "941-\u5c11\u6578\u80a1\u6b0a\u6de8\u5229": {
+                    "9411-\u5c11\u6578\u80a1\u6b0a\u6de8\u5229": {}
+                }
+            },
+            "root_type": "Expense"
+        }
+    }
+}

erpnext/accounts/doctype/account/test_account.js

@@ -0,0 +1,29 @@
+QUnit.module('accounts');
+
+QUnit.test("test account", function(assert) {
+	assert.expect(4);
+	let done = assert.async();
+	frappe.run_serially([
+		() => frappe.set_route('Tree', 'Account'),
+		() => frappe.timeout(3),
+		() => frappe.click_button('Expand All'),
+		() => frappe.timeout(1),
+		() => frappe.click_link('Debtors'),
+		() => frappe.click_button('Edit'),
+		() => frappe.timeout(1),
+		() => {
+			assert.ok(cur_frm.doc.root_type=='Asset');
+			assert.ok(cur_frm.doc.report_type=='Balance Sheet');
+			assert.ok(cur_frm.doc.account_type=='Receivable');
+		},
+		() => frappe.click_button('Ledger'),
+		() => frappe.timeout(1),
+		() => {
+			// check if general ledger report shown
+			assert.deepEqual(frappe.get_route(), ['query-report', 'General Ledger']);
+			window.history.back();
+			return frappe.timeout(1);
+		},
+		() => done()
+	]);
+});

erpnext/accounts/doctype/account/test_account.py

@@ -3,6 +3,8 @@
 
 from __future__ import unicode_literals
 import frappe
+from erpnext.stock import get_warehouse_account, get_company_default_inventory_account
+
 
 def _make_test_records(verbose):
 	from frappe.test_runner import make_test_objects
@@ -63,3 +65,24 @@ def _make_test_records(verbose):
 			} for account_name, parent_account, is_group, account_type, currency in accounts])
 
 	return test_objects
+
+def get_inventory_account(company, warehouse=None):
+	account = None
+	if warehouse:
+		account = get_warehouse_account(warehouse, company)
+	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

erpnext/accounts/doctype/account/test_make_tax_account.js

@@ -0,0 +1,46 @@
+QUnit.module('accounts');
+QUnit.test("test account", assert => {
+	assert.expect(3);
+	let done = assert.async();
+	frappe.run_serially([
+		() => frappe.set_route('Tree', 'Account'),
+		() => frappe.click_button('Expand All'),
+		() => frappe.click_link('Duties and Taxes - '+ frappe.get_abbr(frappe.defaults.get_default("Company"))),
+		() => {
+			if($('a:contains("CGST"):visible').length == 0){
+				return frappe.map_tax.make('CGST', 9);
+			}
+		},
+		() => {
+			if($('a:contains("SGST"):visible').length == 0){
+				return frappe.map_tax.make('SGST', 9);
+			}
+		},
+		() => {
+			if($('a:contains("IGST"):visible').length == 0){
+				return frappe.map_tax.make('IGST', 18);
+			}
+		},
+		() => {
+			assert.ok($('a:contains("CGST"):visible').length!=0, "CGST Checked");
+			assert.ok($('a:contains("SGST"):visible').length!=0, "SGST Checked");
+			assert.ok($('a:contains("IGST"):visible').length!=0, "IGST Checked");
+		},
+		() => done()
+	]);
+});
+
+
+frappe.map_tax = {
+	make:function(text,rate){
+		return frappe.run_serially([
+			() => frappe.click_button('Add Child'),
+			() => frappe.timeout(0.2),
+			() => cur_dialog.set_value('account_name',text),
+			() => cur_dialog.set_value('account_type','Tax'),
+			() => cur_dialog.set_value('tax_rate',rate),
+			() => cur_dialog.set_value('account_currency','INR'),
+			() => frappe.click_button('Create New'),
+		]);
+	}
+};

erpnext/accounts/doctype/accounts_settings/accounts_settings.json

@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "beta": 0, 
@@ -10,20 +11,25 @@
  "doctype": "DocType", 
  "document_type": "Other", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "1", 
    "description": "If enabled, the system will post accounting entries for inventory automatically.", 
    "fieldname": "auto_accounting_for_stock", 
    "fieldtype": "Check", 
-   "hidden": 0, 
+   "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Make Accounting Entry For Every Stock Movement", 
    "length": 0, 
    "no_copy": 0, 
@@ -31,6 +37,7 @@
    "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, 
@@ -38,9 +45,11 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.", 
    "fieldname": "acc_frozen_upto", 
    "fieldtype": "Date", 
@@ -48,7 +57,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Accounts Frozen Upto", 
    "length": 0, 
    "no_copy": 0, 
@@ -56,6 +67,7 @@
    "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, 
@@ -63,9 +75,11 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts", 
    "fieldname": "frozen_accounts_modifier", 
    "fieldtype": "Link", 
@@ -73,7 +87,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Role Allowed to Set Frozen Accounts & Edit Frozen Entries", 
    "length": 0, 
    "no_copy": 0, 
@@ -82,6 +98,7 @@
    "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, 
@@ -89,16 +106,20 @@
    "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, 
@@ -106,6 +127,7 @@
    "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, 
@@ -113,9 +135,11 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Role that is allowed to submit transactions that exceed credit limits set.", 
    "fieldname": "credit_controller", 
    "fieldtype": "Link", 
@@ -123,7 +147,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Credit Controller", 
    "length": 0, 
    "no_copy": 0, 
@@ -132,6 +158,7 @@
    "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, 
@@ -139,16 +166,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "check_supplier_invoice_uniqueness", 
    "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": "Check Supplier Invoice Number Uniqueness", 
    "length": 0, 
    "no_copy": 0, 
@@ -157,6 +188,192 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "make_payment_via_journal_entry", 
+   "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": "Make Payment via Journal Entry", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "1", 
+   "fieldname": "unlink_payment_on_cancellation_of_invoice", 
+   "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": "Unlink Payment on Cancellation of Invoice", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "1", 
+   "fieldname": "book_asset_depreciation_entry_automatically", 
+   "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": "Book Asset Depreciation Entry Automatically", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "currency_exchange_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Currency Exchange Settings", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "1", 
+   "fieldname": "allow_stale", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Allow Stale Exchange Rates", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "1", 
+   "depends_on": "eval:doc.allow_stale==0", 
+   "fieldname": "stale_days", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Stale Days", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -164,18 +381,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "icon-cog", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-14 14:32:06.056888", 
+ "modified": "2017-09-05 10:10:03.117505", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Accounts Settings", 
@@ -200,11 +417,53 @@
    "share": 1, 
    "submit": 0, 
    "write": 1
+  },
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Sales User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 0
+  },
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Purchase User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 0
   }
  ], 
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_order": "ASC", 
+ "track_changes": 1, 
  "track_seen": 0
-}
+}

erpnext/accounts/doctype/accounts_settings/accounts_settings.py

@@ -5,27 +5,20 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe import _
-from frappe.utils import cint, comma_and
+from frappe.utils import cint
 from frappe.model.document import Document
 
+
 class AccountsSettings(Document):
 	def on_update(self):
-		frappe.db.set_default("auto_accounting_for_stock", self.auto_accounting_for_stock)
+		pass
 
-		if cint(self.auto_accounting_for_stock):
-			# set default perpetual account in company
-			for company in frappe.db.sql("select name from tabCompany"):
-				company = frappe.get_doc("Company", company[0])
-				company.flags.ignore_permissions = True
-				company.save()
+	def validate(self):
+		self.validate_stale_days()
+
+	def validate_stale_days(self):
+		if not self.allow_stale and cint(self.stale_days) <= 0:
+			frappe.msgprint(
+				"Stale Days should start from 1.", title='Error', indicator='red',
+				raise_exception=1)
 
-			# Create account head for warehouses
-			warehouse_list = frappe.db.sql("select name, company from tabWarehouse", as_dict=1)
-			warehouse_with_no_company = [d.name for d in warehouse_list if not d.company]
-			if warehouse_with_no_company:
-				frappe.throw(_("Company is missing in warehouses {0}").format(comma_and(warehouse_with_no_company)))
-			for wh in warehouse_list:
-				wh_doc = frappe.get_doc("Warehouse", wh.name)
-				wh_doc.flags.ignore_permissions = True
-				wh_doc.save()

erpnext/accounts/doctype/accounts_settings/test_accounts_settings.js

@@ -0,0 +1,35 @@
+QUnit.module('accounts');
+
+QUnit.test("test: Accounts Settings doesn't allow negatives", function (assert) {
+	let done = assert.async();
+
+	assert.expect(2);
+
+	frappe.run_serially([
+		() => frappe.set_route('Form', 'Accounts Settings', 'Accounts Settings'),
+		() => frappe.timeout(2),
+		() => unchecked_if_checked(cur_frm, 'Allow Stale Exchange Rates', frappe.click_check),
+		() => cur_frm.set_value('stale_days', 0),
+		() => frappe.click_button('Save'),
+		() => frappe.timeout(2),
+		() => {
+			assert.ok(cur_dialog);
+		},
+		() => frappe.click_button('Close'),
+		() => cur_frm.set_value('stale_days', -1),
+		() => frappe.click_button('Save'),
+		() => frappe.timeout(2),
+		() => {
+			assert.ok(cur_dialog);
+		},
+		() => frappe.click_button('Close'),
+		() => done()
+	]);
+
+});
+
+const unchecked_if_checked = function(frm, field_name, fn){
+	if (frm.doc.allow_stale) {
+		return fn(field_name);
+	}
+};

erpnext/accounts/doctype/accounts_settings/test_accounts_settings.py

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

erpnext/accounts/doctype/asset/asset.js

@@ -14,7 +14,7 @@ frappe.ui.form.on('Asset', {
 				}
 			};
 		});
-		
+
 		frm.set_query("warehouse", function() {
 			return {
 				"filters": {
@@ -24,11 +24,12 @@ frappe.ui.form.on('Asset', {
 			};
 		});
 	},
-	
+
 	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() {
@@ -39,86 +40,75 @@ frappe.ui.form.on('Asset', {
 				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("Sale Asset", function() {
+
+				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("show_graph");
+
+			frm.trigger("setup_chart");
 		}
 	},
-	
-	show_graph: function(frm) {		
-		var x_intervals = ["x", frm.doc.purchase_date];
-		var asset_values = ["Asset Value", frm.doc.gross_purchase_amount];
+
+	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, 
+			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) - 
+			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);
-			asset_value = flt(frm.doc.gross_purchase_amount) - flt(v.accumulated_depreciation_amount);
-			if(v.journal_entry) {				
+			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)
+					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.setup_chart({
+
+		frm.dashboard.render_graph({
+			title: "Asset Value",
 			data: {
-				x: 'x',
-				columns: [x_intervals, asset_values],
-				regions: {
-					'Asset Value': [{'start': last_depreciation_date, 'style':'dashed'}]
-				}
+				labels: x_intervals,
+				datasets: [{
+					color: 'green',
+					values: asset_values,
+					formatted: asset_values.map(d => d.toFixed(2))
+				}]
 			},
-			legend: {
-				show: false
-			},
-			axis: {
-				x: {
-					type: 'timeseries',
-					tick: {
-						format: "%d-%m-%Y"
-					}
-				},
-				y: {
-					min: 0,
-					padding: {bottom: 10}
-				}
-			}
-		});		
+			type: 'line'
+		});
 	},
-	
+
+
 	item_code: function(frm) {
 		if(frm.doc.item_code) {
 			frappe.call({
@@ -136,11 +126,27 @@ frappe.ui.form.on('Asset', {
 			})
 		}
 	},
-	
+
 	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', {
@@ -159,9 +165,25 @@ frappe.ui.form.on('Depreciation Schedule', {
 				}
 			})
 		}
+	},
+
+	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: {
@@ -227,9 +249,9 @@ erpnext.asset.transfer_asset = function(frm) {
 		title: __("Transfer Asset"),
 		fields: [
 			{
-				"label": __("Target Warehouse"), 
+				"label": __("Target Warehouse"),
 				"fieldname": "target_warehouse",
-				"fieldtype": "Link", 
+				"fieldtype": "Link",
 				"options": "Warehouse",
 				"get_query": function () {
 					return {
@@ -238,13 +260,13 @@ erpnext.asset.transfer_asset = function(frm) {
 							["Warehouse", "is_group", "=", 0]
 						]
 					}
-				}, 
-				"reqd": 1 
+				},
+				"reqd": 1
 			},
 			{
-				"label": __("Date"), 
+				"label": __("Date"),
 				"fieldname": "transfer_date",
-				"fieldtype": "Datetime", 
+				"fieldtype": "Datetime",
 				"reqd": 1,
 				"default": frappe.datetime.now_datetime()
 			}
@@ -252,7 +274,7 @@ erpnext.asset.transfer_asset = function(frm) {
 	});
 
 	dialog.set_primary_action(__("Transfer"), function() {
-		args = dialog.get_values();
+		var args = dialog.get_values();
 		if(!args) return;
 		dialog.hide();
 		return frappe.call({

erpnext/accounts/doctype/asset/asset.json

@@ -9,18 +9,22 @@
  "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, 
@@ -29,6 +33,7 @@
    "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, 
@@ -39,13 +44,16 @@
    "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, 
@@ -55,6 +63,7 @@
    "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, 
@@ -65,22 +74,26 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "asset_category", 
-   "fieldtype": "Link", 
+   "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, 
-   "label": "Asset Category", 
+   "in_standard_filter": 0, 
+   "label": "Item Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Asset Category", 
+   "options": "item_code.item_name", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 1, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -91,6 +104,37 @@
    "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", 
@@ -98,7 +142,9 @@
    "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, 
@@ -108,6 +154,7 @@
    "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, 
@@ -118,13 +165,16 @@
    "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, 
@@ -133,6 +183,7 @@
    "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, 
@@ -143,13 +194,16 @@
    "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, 
@@ -157,6 +211,7 @@
    "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, 
@@ -167,13 +222,16 @@
    "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, 
@@ -183,6 +241,7 @@
    "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, 
@@ -193,13 +252,16 @@
    "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, 
@@ -209,6 +271,7 @@
    "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, 
@@ -219,13 +282,16 @@
    "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, 
@@ -234,6 +300,7 @@
    "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, 
@@ -244,13 +311,16 @@
    "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, 
@@ -259,6 +329,7 @@
    "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, 
@@ -269,13 +340,16 @@
    "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, 
@@ -285,6 +359,7 @@
    "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, 
@@ -295,13 +370,16 @@
    "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, 
@@ -311,6 +389,7 @@
    "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, 
@@ -321,13 +400,16 @@
    "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, 
@@ -336,6 +418,7 @@
    "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, 
@@ -346,13 +429,16 @@
    "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, 
@@ -362,6 +448,7 @@
    "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, 
@@ -372,13 +459,16 @@
    "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, 
@@ -386,6 +476,7 @@
    "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, 
@@ -396,13 +487,16 @@
    "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, 
@@ -412,6 +506,7 @@
    "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, 
@@ -422,6 +517,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "expected_value_after_useful_life", 
    "fieldtype": "Currency", 
@@ -429,7 +525,9 @@
    "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, 
@@ -439,6 +537,7 @@
    "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, 
@@ -449,6 +548,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "is_existing_asset", 
    "fieldname": "opening_accumulated_depreciation", 
    "fieldtype": "Currency", 
@@ -456,7 +556,9 @@
    "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, 
@@ -466,6 +568,7 @@
    "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, 
@@ -476,13 +579,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "value_after_depreciation", 
    "fieldtype": "Currency", 
-   "hidden": 0, 
+   "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, 
@@ -492,6 +598,7 @@
    "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, 
@@ -502,13 +609,16 @@
    "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, 
@@ -516,6 +626,7 @@
    "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, 
@@ -526,6 +637,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "", 
    "depends_on": "", 
    "fieldname": "depreciation_method", 
@@ -534,16 +646,19 @@
    "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", 
+   "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, 
@@ -554,13 +669,16 @@
    "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, 
@@ -569,6 +687,7 @@
    "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, 
@@ -579,6 +698,7 @@
    "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", 
@@ -586,7 +706,9 @@
    "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, 
@@ -595,6 +717,7 @@
    "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, 
@@ -605,13 +728,16 @@
    "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, 
@@ -620,6 +746,7 @@
    "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, 
@@ -630,6 +757,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "next_depreciation_date", 
    "fieldtype": "Date", 
@@ -637,7 +765,9 @@
    "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, 
@@ -646,6 +776,7 @@
    "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, 
@@ -656,13 +787,16 @@
    "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, 
@@ -671,6 +805,7 @@
    "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, 
@@ -681,13 +816,16 @@
    "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, 
@@ -696,7 +834,8 @@
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 1, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -707,13 +846,16 @@
    "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, 
@@ -722,6 +864,7 @@
    "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, 
@@ -740,7 +883,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-05 12:54:38.585259", 
+ "modified": "2017-02-17 16:26:19.111939", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Asset", 
@@ -771,7 +914,9 @@
  "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

@@ -18,7 +18,9 @@ class Asset(Document):
 		self.set_missing_values()
 		self.validate_asset_values()
 		self.make_depreciation_schedule()
-		self.validate_expected_value_after_useful_life()
+		self.set_accumulated_depreciation()
+		if self.get("schedules"):
+			self.validate_expected_value_after_useful_life()
 		# Validate depreciation related accounts
 		get_depreciation_accounts(self)
 
@@ -31,7 +33,7 @@ class Asset(Document):
 		self.set_status()
 
 	def validate_item(self):
-		item = frappe.db.get_value("Item", self.item_code, 
+		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))
@@ -41,15 +43,15 @@ class Asset(Document):
 			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) - 
+
+		self.value_after_depreciation = (flt(self.gross_purchase_amount) -
 			flt(self.opening_accumulated_depreciation))
 
 	def validate_asset_values(self):
@@ -58,7 +60,7 @@ class Asset(Document):
 
 		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
@@ -69,29 +71,33 @@ class Asset(Document):
 			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"))
-			
-		if (flt(self.value_after_depreciation) > flt(self.expected_value_after_useful_life) 
+			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):
-		self.schedules = []
+		if self.depreciation_method != 'Manual':
+			self.schedules = []
+
 		if not self.get("schedules") and self.next_depreciation_date:
-			accumulated_depreciation = flt(self.opening_accumulated_depreciation)
 			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:
@@ -100,20 +106,32 @@ class Asset(Document):
 						n * cint(self.frequency_of_depreciation))
 
 					depreciation_amount = self.get_depreciation_amount(value_after_depreciation)
-				
-					accumulated_depreciation += flt(depreciation_amount)
 					value_after_depreciation -= flt(depreciation_amount)
 
 					self.append("schedules", {
 						"schedule_date": schedule_date,
-						"depreciation_amount": depreciation_amount,
-						"accumulated_depreciation_amount": accumulated_depreciation
+						"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 == "Straight Line":
+		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) - 
+				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
@@ -124,18 +142,18 @@ class Asset(Document):
 				depreciation_amount = flt(depreciable_value) - flt(self.expected_value_after_useful_life)
 
 		return depreciation_amount
-		
+
 	def validate_expected_value_after_useful_life(self):
-		if self.depreciation_method == "Double Declining Balance":
-			accumulated_depreciation_after_full_schedule = \
-				max([d.accumulated_depreciation_amount for d in self.get("schedules")])
-			
-			asset_value_after_full_schedule = (flt(self.gross_purchase_amount) - 
-				flt(accumulated_depreciation_after_full_schedule))
-			
-			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))
+		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"):
@@ -149,8 +167,8 @@ class Asset(Document):
 			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", 
+
+		self.db_set("value_after_depreciation",
 			(flt(self.gross_purchase_amount) - flt(self.opening_accumulated_depreciation)))
 
 	def set_status(self, status=None):
@@ -181,6 +199,7 @@ def make_purchase_invoice(asset, item_code, gross_purchase_amount, company, post
 	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,
@@ -193,7 +212,7 @@ def make_purchase_invoice(asset, item_code, gross_purchase_amount, company, post
 	})
 	pi.set_missing_values()
 	return pi
-	
+
 @frappe.whitelist()
 def make_sales_invoice(asset, item_code, company):
 	si = frappe.new_doc("Sales Invoice")
@@ -210,7 +229,7 @@ def make_sales_invoice(asset, item_code, company):
 	})
 	si.set_missing_values()
 	return si
-	
+
 @frappe.whitelist()
 def transfer_asset(args):
 	import json
@@ -219,23 +238,23 @@ def transfer_asset(args):
 	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, 
+
+	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
+
+	return ret

erpnext/accounts/doctype/asset/asset_list.js

@@ -0,0 +1,3 @@
+frappe.listview_settings['Asset'] = {
+	add_fields: ['image']
+}

erpnext/accounts/doctype/asset/depreciation.py

@@ -8,6 +8,10 @@ from frappe import _
 from frappe.utils import flt, today, getdate
 
 def post_depreciation_entries(date=None):
+	# Return if automatic booking of asset depreciation is disabled
+	if not frappe.db.get_value("Accounts Settings", None, "book_asset_depreciation_entry_automatically"):
+		return
+		
 	if not date:
 		date = today()
 	for asset in get_depreciable_assets(date):
@@ -32,12 +36,15 @@ def make_depreciation_entry(asset_name, date=None):
 	fixed_asset_account, accumulated_depreciation_account, depreciation_expense_account = \
 		get_depreciation_accounts(asset)
 
-	depreciation_cost_center = frappe.db.get_value("Company", asset.company, "depreciation_cost_center")
+	depreciation_cost_center, depreciation_series = frappe.db.get_value("Company", asset.company,
+		["depreciation_cost_center", "series_for_depreciation_entry"])
+	
 
 	for d in asset.get("schedules"):
 		if not d.journal_entry and getdate(d.schedule_date) <= getdate(date):
 			je = frappe.new_doc("Journal Entry")
 			je.voucher_type = "Depreciation Entry"
+			je.naming_series = depreciation_series
 			je.posting_date = d.schedule_date
 			je.company = asset.company
 			je.remark = "Depreciation Entry against {0} worth {1}".format(asset_name, d.depreciation_amount)
@@ -105,8 +112,11 @@ def scrap_asset(asset_name):
 	elif asset.status in ("Cancelled", "Sold", "Scrapped"):
 		frappe.throw(_("Asset {0} cannot be scrapped, as it is already {1}").format(asset.name, asset.status))
 
+	depreciation_series = frappe.db.get_value("Company", asset.company, "series_for_depreciation_entry")
+
 	je = frappe.new_doc("Journal Entry")
 	je.voucher_type = "Journal Entry"
+	je.naming_series = depreciation_series
 	je.posting_date = today()
 	je.company = asset.company
 	je.remark = "Scrap Entry for asset {0}".format(asset_name)

erpnext/accounts/doctype/asset/test_asset.py

@@ -5,7 +5,7 @@ from __future__ import unicode_literals
 
 import frappe
 import unittest
-from frappe.utils import cstr, nowdate, getdate
+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
 
@@ -13,6 +13,7 @@ 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")
@@ -119,6 +120,30 @@ class TestAsset(unittest.TestCase):
 			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")
@@ -126,11 +151,16 @@ class TestAsset(unittest.TestCase):
 		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)
@@ -142,6 +172,23 @@ class TestAsset(unittest.TestCase):
 
 		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")
@@ -202,6 +249,23 @@ class TestAsset(unittest.TestCase):
 
 		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")
 
@@ -273,4 +337,7 @@ def set_depreciation_settings_in_company():
 	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()
+	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.js

@@ -2,15 +2,6 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Asset Category', {
-	setup: function(frm) {
-		frm.get_field('accounts').grid.editable_fields = [
-			{fieldname: 'company_name', columns: 3},
-			{fieldname: 'fixed_asset_account', columns: 3},
-			{fieldname: 'accumulated_depreciation_account', columns: 2},
-			{fieldname: 'depreciation_expense_account', columns: 2}
-		];
-	},
-
 	onload: function(frm) {
 		frm.add_fetch('company_name', 'accumulated_depreciation_account', 'accumulated_depreciation_account');
 		frm.add_fetch('company_name', 'depreciation_expense_account', 'accumulated_depreciation_account');

erpnext/accounts/doctype/asset_category/asset_category.json

@@ -3,23 +3,29 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:asset_category_name", 
+ "beta": 0, 
  "creation": "2016-03-01 17:41:39.778765", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Document", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "asset_category_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 Category Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -28,6 +34,7 @@
    "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, 
@@ -38,6 +45,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Straight Line", 
    "fieldname": "depreciation_method", 
    "fieldtype": "Select", 
@@ -45,7 +53,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Depreciation Method", 
    "length": 0, 
    "no_copy": 0, 
@@ -55,6 +65,7 @@
    "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, 
@@ -65,13 +76,16 @@
    "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, 
@@ -79,6 +93,7 @@
    "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, 
@@ -89,13 +104,16 @@
    "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, 
@@ -104,6 +122,7 @@
    "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, 
@@ -114,13 +133,16 @@
    "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, 
@@ -129,6 +151,7 @@
    "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, 
@@ -139,13 +162,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_2", 
    "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": "Accounts", 
    "length": 0, 
    "no_copy": 0, 
@@ -154,6 +180,7 @@
    "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, 
@@ -164,13 +191,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "accounts", 
    "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": "Accounts", 
    "length": 0, 
    "no_copy": 0, 
@@ -180,6 +210,7 @@
    "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, 
@@ -190,13 +221,14 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 0, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-04-20 13:23:09.890324", 
+ "modified": "2017-02-17 16:09:52.955332", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Asset Category", 
@@ -247,7 +279,9 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }

erpnext/accounts/doctype/asset_category_account/asset_category_account.json

@@ -14,6 +14,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 3, 
    "fieldname": "company_name", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -30,6 +31,7 @@
    "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, 
@@ -40,6 +42,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 3, 
    "fieldname": "fixed_asset_account", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -56,6 +59,7 @@
    "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, 
@@ -66,6 +70,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "accumulated_depreciation_account", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -82,6 +87,7 @@
    "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, 
@@ -92,6 +98,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "depreciation_expense_account", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -108,6 +115,7 @@
    "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, 
@@ -125,7 +133,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-11 03:27:58.048060", 
+ "modified": "2016-11-03 15:12:55.775239", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Asset Category Account", 

erpnext/accounts/doctype/asset_movement/asset_movement.js

@@ -4,7 +4,7 @@
 frappe.ui.form.on('Asset Movement', {
 	onload: function(frm) {
 		frm.add_fetch("asset", "warehouse", "source_warehouse");
-		
+
 		frm.set_query("target_warehouse", function() {
 			return {
 				filters: [

erpnext/accounts/doctype/asset_movement/asset_movement.json

@@ -3,23 +3,28 @@
  "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, 
@@ -29,6 +34,7 @@
    "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, 
@@ -39,13 +45,16 @@
    "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, 
@@ -54,6 +63,7 @@
    "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, 
@@ -64,13 +74,16 @@
    "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, 
@@ -80,6 +93,7 @@
    "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, 
@@ -90,13 +104,16 @@
    "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, 
@@ -104,6 +121,7 @@
    "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, 
@@ -114,13 +132,16 @@
    "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, 
@@ -130,6 +151,7 @@
    "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, 
@@ -140,13 +162,16 @@
    "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, 
@@ -156,6 +181,7 @@
    "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, 
@@ -166,13 +192,16 @@
    "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, 
@@ -181,6 +210,7 @@
    "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, 
@@ -191,13 +221,14 @@
  "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": "2016-04-25 19:14:08.853429", 
+ "modified": "2017-02-17 16:09:32.069344", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Asset Movement", 
@@ -268,7 +299,9 @@
  "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/bank_guarantee/bank_guarantee.js

@@ -0,0 +1,30 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Bank Guarantee', {
+	refresh: function(frm) {
+		cur_frm.set_query("account", function() {
+			return {
+				"filters": {
+					"account_type": "Bank",
+					"is_group": 0
+				}
+			};
+		});
+		cur_frm.set_query("project", function() {
+			return {
+				"filters": {
+					"customer": cur_frm.doc.customer
+				}
+			};
+		});
+	},
+	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);
+	},
+	validity: 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);
+	}
+});

erpnext/accounts/doctype/bank_guarantee/bank_guarantee.json

@@ -0,0 +1,448 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "BG-.#####", 
+ "beta": 0, 
+ "creation": "2016-12-17 10:43:35.731631", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "customer", 
+   "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": "Customer", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Customer", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "project", 
+   "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": "Project", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Project", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "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": "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_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amount", 
+   "fieldtype": "Currency", 
+   "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": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "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_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": 0, 
+   "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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "", 
+   "fieldname": "validity", 
+   "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": "Validity in Days", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 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": "end_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": "End 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": 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": "bank_guarantee_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": "Bank Guarantee 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": 1, 
+   "search_index": 0, 
+   "set_only_once": 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_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": "Notes", 
+   "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, 
+   "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": "Bank Guarantee", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-04-25 13:31:49.627831", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Bank Guarantee", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "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": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "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
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "search_fields": "customer", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "customer", 
+ "track_changes": 0, 
+ "track_seen": 0
+}

erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py

@@ -6,5 +6,5 @@ from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
 
-class StudentBatchStudent(Document):
+class BankGuarantee(Document):
 	pass

erpnext/accounts/doctype/bank_guarantee/test_bank_guarantee.py

@@ -6,7 +6,7 @@ from __future__ import unicode_literals
 import frappe
 import unittest
 
-# test_records = frappe.get_test_records('Payment Gateway')
+# test_records = frappe.get_test_records('Bank Guarantee')
 
-class TestPaymentGateway(unittest.TestCase):
+class TestBankGuarantee(unittest.TestCase):
 	pass

erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js

@@ -3,26 +3,19 @@
 
 frappe.ui.form.on("Bank Reconciliation", {
 	setup: function(frm) {
-		frm.get_docfield("payment_entries").allow_bulk_edit = 1;
 		frm.add_fetch("bank_account", "account_currency", "account_currency");
-
-		frm.get_field('payment_entries').grid.editable_fields = [
-			{fieldname: 'against_account', columns: 3},
-			{fieldname: 'amount', columns: 2},
-			{fieldname: 'cheque_number', columns: 3},
-			{fieldname: 'clearance_date', columns: 2}
-		];
 	},
 
 	onload: function(frm) {
-		var default_bank_account =  locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"];
 
+		let default_bank_account =  frappe.defaults.get_user_default("Company")? 
+			locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"]: "";
 		frm.set_value("bank_account", default_bank_account);
 
 		frm.set_query("bank_account", function() {
 			return {
 				"filters": {
-					"account_type": "Bank",
+					"account_type": ["in",["Bank","Cash"]],
 					"is_group": 0
 				}
 			};
@@ -53,6 +46,12 @@ frappe.ui.form.on("Bank Reconciliation", {
 			callback: function(r, rt) {
 				frm.refresh_field("payment_entries");
 				frm.refresh_fields();
+
+				$(frm.fields_dict.payment_entries.wrapper).find("[data-fieldname=amount]").each(function(i,v){
+					if (i !=0){
+						$(v).addClass("text-right")
+					}
+				})
 			}
 		});
 	}

erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json

@@ -1,5 +1,6 @@
 {
  "allow_copy": 1, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "beta": 0, 
@@ -7,11 +8,15 @@
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Select account head of the bank where cheque was deposited.", 
    "fieldname": "bank_account", 
    "fieldtype": "Link", 
@@ -19,7 +24,9 @@
    "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, 
@@ -28,6 +35,7 @@
    "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, 
@@ -35,16 +43,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "account_currency", 
    "fieldtype": "Link", 
    "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": "Account Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -53,6 +65,7 @@
    "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, 
@@ -60,16 +73,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "from_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": "From Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -77,6 +94,7 @@
    "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, 
@@ -84,16 +102,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "to_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": "To Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -101,6 +123,7 @@
    "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, 
@@ -108,16 +131,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "include_reconciled_entries", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Include Reconciled Entries", 
    "length": 0, 
    "no_copy": 0, 
@@ -125,6 +152,7 @@
    "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, 
@@ -132,16 +160,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "get_payment_entries", 
    "fieldtype": "Button", 
    "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": "Get Payment Entries", 
    "length": 0, 
    "no_copy": 0, 
@@ -150,6 +182,7 @@
    "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, 
@@ -157,16 +190,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 1, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "payment_entries", 
    "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": "Payment Entries", 
    "length": 0, 
    "no_copy": 0, 
@@ -175,6 +212,7 @@
    "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, 
@@ -182,16 +220,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "update_clearance_date", 
    "fieldtype": "Button", 
    "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": "Update Clearance Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -200,6 +242,7 @@
    "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, 
@@ -207,16 +250,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_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": "Total Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -225,6 +272,7 @@
    "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, 
@@ -232,19 +280,19 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 1, 
  "hide_toolbar": 1, 
- "icon": "icon-check", 
+ "icon": "fa fa-check", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-06-28 13:11:09.396353", 
+ "modified": "2017-04-21 16:58:26.902732", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Bank Reconciliation", 
@@ -274,7 +322,8 @@
  "quick_entry": 1, 
  "read_only": 1, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_order": "ASC", 
- "track_seen": 0, 
- "version": 0
+ "track_changes": 0, 
+ "track_seen": 0
 }

erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py

@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.utils import flt, getdate, nowdate
+from frappe.utils import flt, getdate, nowdate, fmt_money
 from frappe import msgprint, _
 from frappe.model.document import Document
 
@@ -26,8 +26,8 @@ class BankReconciliation(Document):
 			select 
 				"Journal Entry" as payment_document, t1.name as payment_entry, 
 				t1.cheque_no as cheque_number, t1.cheque_date, 
-				abs(t2.debit_in_account_currency - t2.credit_in_account_currency) as amount, 
-				t1.posting_date, t2.against_account, t1.clearance_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 
 			from
 				`tabJournal Entry` t1, `tabJournal Entry Account` t2
 			where
@@ -36,21 +36,23 @@ class BankReconciliation(Document):
 				and ifnull(t1.is_opening, 'No') = 'No' {0}
 			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=%s, paid_amount, received_amount) as amount, 
-				posting_date, party as against_account, clearance_date
+				if(paid_from=%(account)s, paid_amount, "") as credit, 
+				if(paid_from=%(account)s, "", 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=%s or paid_to=%s) and docstatus=1
-				and posting_date >= %s and posting_date <= %s {0}
+				(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 
 				posting_date ASC, name DESC
 		""".format(condition), 
-		(self.bank_account, self.bank_account, self.bank_account, self.from_date, self.to_date), as_dict=1)
+		        {"account":self.bank_account, "from":self.from_date, "to":self.to_date}, as_dict=1)
 		
 		entries = sorted(list(payment_entries)+list(journal_entries), 
 			key=lambda k: k['posting_date'] or getdate(nowdate()))
@@ -60,13 +62,21 @@ class BankReconciliation(Document):
 
 		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"))
+			d.pop("credit")
+			d.pop("debit")
+			d.pop("account_currency")
 			row.update(d)
-			self.total_amount += flt(d.amount)
+			self.total_amount += flt(amount)
 
 	def update_clearance_date(self):
 		clearance_date_updated = False
 		for d in self.get('payment_entries'):
 			if d.clearance_date:
+				if not d.payment_document:
+					frappe.throw(_("Row #{0}: Payment document is required to complete the trasaction"))
+
 				if d.cheque_date and getdate(d.clearance_date) < getdate(d.cheque_date):
 					frappe.throw(_("Row #{0}: Clearance date {1} cannot be before Cheque Date {2}")
 						.format(d.idx, d.clearance_date, d.cheque_date))

erpnext/accounts/doctype/bank_reconciliation/test_bank_reconciliation.js

@@ -0,0 +1,22 @@
+QUnit.module('Account');
+
+QUnit.test("test Bank Reconciliation", function(assert) {
+	assert.expect(0);
+	let done = assert.async();
+	frappe.run_serially([
+		() => frappe.set_route('Form', 'Bank Reconciliation'),
+		() => cur_frm.set_value('bank_account','Cash - FT'),
+		() => frappe.click_button('Get Payment Entries'),
+		() => {
+			for(var i=0;i<=cur_frm.doc.payment_entries.length-1;i++){
+				cur_frm.doc.payment_entries[i].clearance_date = frappe.datetime.add_days(frappe.datetime.now_date(), 2);
+			}
+		},
+		() => {cur_frm.refresh_fields('payment_entries');},
+		() => frappe.click_button('Update Clearance Date'),
+		() => frappe.timeout(0.5),
+		() => frappe.click_button('Close'),
+		() => done()
+	]);
+});
+

erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json

@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "beta": 0, 
@@ -10,16 +11,20 @@
  "editable_grid": 1, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "payment_document", 
    "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": "Payment Document", 
    "length": 0, 
    "no_copy": 0, 
@@ -29,6 +34,7 @@
    "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, 
@@ -36,16 +42,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "payment_entry", 
    "fieldtype": "Dynamic 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": "Payment Entry", 
    "length": 0, 
    "no_copy": 0, 
@@ -56,6 +66,7 @@
    "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, 
@@ -64,16 +75,20 @@
    "width": "50"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "against_account", 
    "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": "Against Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -83,6 +98,7 @@
    "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, 
@@ -91,26 +107,31 @@
    "width": "15"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "amount", 
-   "fieldtype": "Currency", 
+   "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": "Amount", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "debit", 
    "oldfieldtype": "Currency", 
-   "options": "account_currency", 
+   "options": "", 
    "permlevel": 0, 
    "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, 
@@ -118,16 +139,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_5", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -135,6 +160,7 @@
    "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, 
@@ -143,16 +169,20 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "posting_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": "Posting Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -162,6 +192,7 @@
    "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, 
@@ -169,16 +200,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "cheque_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": 0, 
    "label": "Cheque Number", 
    "length": 0, 
    "no_copy": 0, 
@@ -188,6 +223,7 @@
    "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, 
@@ -195,16 +231,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "cheque_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": "Cheque Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -214,6 +254,7 @@
    "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, 
@@ -221,16 +262,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "clearance_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": "Clearance Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -240,6 +285,7 @@
    "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, 
@@ -247,18 +293,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-07-11 03:27:58.139117", 
+ "modified": "2017-06-23 12:07:50.883515", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Bank Reconciliation Detail", 
@@ -267,6 +313,8 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_order": "ASC", 
+ "track_changes": 0, 
  "track_seen": 0
 }

erpnext/accounts/doctype/budget/budget.js

@@ -10,6 +10,14 @@ frappe.ui.form.on('Budget', {
 				}
 			}
 		})
+
+		frm.set_query("project", function() {
+			return {
+				filters: {
+					company: frm.doc.company
+				}
+			}
+		})
 		
 		frm.set_query("account", "accounts", function() {
 			return {
@@ -28,5 +36,27 @@ frappe.ui.form.on('Budget', {
 				}
 			}
 		})
+	},
+
+	refresh: function(frm) {
+		frm.trigger("toggle_reqd_fields")
+	},
+
+	budget_against: function(frm) {
+		frm.trigger("set_null_value")
+		frm.trigger("toggle_reqd_fields")
+	},
+
+	set_null_value: function(frm) {
+		if(frm.doc.budget_against == 'Cost Center') {
+			frm.set_value('project', null)
+		} else {
+			frm.set_value('cost_center', null)
+		}
+	},
+
+	toggle_reqd_fields: function(frm) {
+		frm.toggle_reqd("cost_center", frm.doc.budget_against=="Cost Center");
+		frm.toggle_reqd("project", frm.doc.budget_against=="Project");
 	}
 });

erpnext/accounts/doctype/budget/budget.json

@@ -14,48 +14,27 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "cost_center", 
-   "fieldtype": "Link", 
+   "columns": 0, 
+   "default": "Cost Center", 
+   "fieldname": "budget_against", 
+   "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
-   "label": "Cost Center", 
+   "in_standard_filter": 1, 
+   "label": "Budget Against", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Cost Center", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "fiscal_year", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Fiscal Year", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Fiscal Year", 
+   "options": "\nCost Center\nProject", 
    "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, 
@@ -66,13 +45,16 @@
    "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, 
@@ -82,6 +64,7 @@
    "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, 
@@ -92,13 +75,108 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.budget_against == 'Cost Center'", 
+   "fieldname": "cost_center", 
+   "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": "Cost Center", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Cost Center", 
+   "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.budget_against == 'Project'", 
+   "fieldname": "project", 
+   "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": "Project", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Project", 
+   "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": "fiscal_year", 
+   "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": "Fiscal Year", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Fiscal Year", 
+   "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": "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, 
@@ -106,6 +184,7 @@
    "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, 
@@ -116,6 +195,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Stop", 
    "fieldname": "action_if_annual_budget_exceeded", 
    "fieldtype": "Select", 
@@ -123,7 +203,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Action if Annual Budget Exceeded", 
    "length": 0, 
    "no_copy": 0, 
@@ -133,6 +215,7 @@
    "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, 
@@ -143,6 +226,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Warn", 
    "description": "", 
    "fieldname": "action_if_accumulated_monthly_budget_exceeded", 
@@ -151,7 +235,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Action if Accumulated Monthly Budget Exceeded", 
    "length": 0, 
    "no_copy": 0, 
@@ -161,6 +247,7 @@
    "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, 
@@ -171,6 +258,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:in_list([\"Stop\", \"Warn\"], doc.action_if_accumulated_monthly_budget_exceeded)", 
    "fieldname": "monthly_distribution", 
    "fieldtype": "Link", 
@@ -178,7 +266,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Monthly Distribution", 
    "length": 0, 
    "no_copy": 0, 
@@ -188,6 +278,7 @@
    "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, 
@@ -198,13 +289,16 @@
    "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, 
@@ -213,6 +307,7 @@
    "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, 
@@ -223,13 +318,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_6", 
    "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, 
@@ -237,6 +335,7 @@
    "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, 
@@ -247,13 +346,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "accounts", 
    "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": "Budget Accounts", 
    "length": 0, 
    "no_copy": 0, 
@@ -263,6 +365,7 @@
    "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, 
@@ -280,7 +383,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-08-18 14:46:02.653081", 
+ "modified": "2017-02-17 16:25:32.342055", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Budget", 
@@ -311,7 +414,9 @@
  "quick_entry": 0, 
  "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/budget/budget.py

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+ # -*- coding: utf-8 -*-
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
@@ -14,20 +14,26 @@ class DuplicateBudgetError(frappe.ValidationError): pass
 
 class Budget(Document):
 	def autoname(self):
-		self.name = make_autoname(self.cost_center + "/" + self.fiscal_year + "/.###")
+		self.name = make_autoname(self.get(frappe.scrub(self.budget_against)) 
+			+ "/" + self.fiscal_year + "/.###")
 
 	def validate(self):
+		if not self.get(frappe.scrub(self.budget_against)):
+			frappe.throw(_("{0} is mandatory").format(self.budget_against))
 		self.validate_duplicate()
 		self.validate_accounts()
+		self.set_null_value()
 
 	def validate_duplicate(self):
-		existing_budget = frappe.db.get_value("Budget", {"cost_center": self.cost_center,
+		budget_against_field = frappe.scrub(self.budget_against)
+		budget_against = self.get(budget_against_field)
+		existing_budget = frappe.db.get_value("Budget", {budget_against_field: budget_against,
 			"fiscal_year": self.fiscal_year, "company": self.company,
 			"name": ["!=", self.name], "docstatus": ["!=", 2]})
-		if existing_budget:
-			frappe.throw(_("Another Budget record {0} already exists against {1} for fiscal year {2}")
-				.format(existing_budget, self.cost_center, self.fiscal_year), DuplicateBudgetError)
-
+		if existing_budget: 
+			frappe.throw(_("Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3}")
+				.format(existing_budget, self.budget_against, budget_against, self.fiscal_year), DuplicateBudgetError)
+	
 	def validate_accounts(self):
 		account_list = []
 		for d in self.get('accounts'):
@@ -49,55 +55,113 @@ class Budget(Document):
 				else:
 					account_list.append(d.account)
 
+	def set_null_value(self):
+		if self.budget_against == 'Cost Center':
+			self.project = None
+		else:
+			self.cost_center = None
+
 def validate_expense_against_budget(args):
 	args = frappe._dict(args)
-	if frappe.db.get_value("Account", {"name": args.account, "root_type": "Expense"}):
-		cc_lft, cc_rgt = frappe.db.get_value("Cost Center", args.cost_center, ["lft", "rgt"])
+	if not args.cost_center and not args.project:
+		return
+	for budget_against in ['project', 'cost_center']:
+		if args.get(budget_against) \
+				and frappe.db.get_value("Account", {"name": args.account, "root_type": "Expense"}):
 
-		budget_records = frappe.db.sql("""
-			select ba.budget_amount, b.monthly_distribution, b.cost_center,
-				b.action_if_annual_budget_exceeded, b.action_if_accumulated_monthly_budget_exceeded
-			from `tabBudget` b, `tabBudget Account` ba
-			where
-				b.name=ba.parent and b.fiscal_year=%s and ba.account=%s and b.docstatus=1
-				and exists(select name from `tabCost Center` where lft<=%s and rgt>=%s and name=b.cost_center)
-		""", (args.fiscal_year, args.account, cc_lft, cc_rgt), as_dict=True)
+			if args.project and budget_against == 'project':
+				condition = "and b.project='%s'" % frappe.db.escape(args.project)
+				args.budget_against_field = "Project"
+			
+			elif args.cost_center and budget_against == 'cost_center':
+				cc_lft, cc_rgt = frappe.db.get_value("Cost Center", args.cost_center, ["lft", "rgt"])
+				condition = """and exists(select name from `tabCost Center` 
+					where lft<=%s and rgt>=%s and name=b.cost_center)""" % (cc_lft, cc_rgt)
+				args.budget_against_field = "Cost Center"
 
-		for budget in budget_records:
-			if budget.budget_amount:
-				yearly_action = budget.action_if_annual_budget_exceeded
-				monthly_action = budget.action_if_accumulated_monthly_budget_exceeded
+			args.budget_against = args.get(budget_against)
 
-				if monthly_action in ["Stop", "Warn"]:
-					budget_amount = get_accumulated_monthly_budget(budget.monthly_distribution,
-						args.posting_date, args.fiscal_year, budget.budget_amount)
+			budget_records = frappe.db.sql("""
+				select
+					b.{budget_against_field} as budget_against, ba.budget_amount, b.monthly_distribution,
+					b.action_if_annual_budget_exceeded, 
+					b.action_if_accumulated_monthly_budget_exceeded
+				from 
+					`tabBudget` b, `tabBudget Account` ba
+				where
+					b.name=ba.parent and b.fiscal_year=%s 
+					and ba.account=%s and b.docstatus=1
+					{condition}
+			""".format(condition=condition, 
+				budget_against_field=frappe.scrub(args.get("budget_against_field"))),
+				(args.fiscal_year, args.account), as_dict=True)
+				
+			if budget_records:
+				validate_budget_records(args, budget_records)
 
-					args["month_end_date"] = get_last_day(args.posting_date)
-						
-					compare_expense_with_budget(args, budget.cost_center,
-						budget_amount, _("Accumulated Monthly"), monthly_action)
+def validate_budget_records(args, budget_records):
+	for budget in budget_records:
+		if flt(budget.budget_amount):
+			yearly_action = budget.action_if_annual_budget_exceeded
+			monthly_action = budget.action_if_accumulated_monthly_budget_exceeded
 
-				if yearly_action in ("Stop", "Warn") and monthly_action != "Stop" \
-					and yearly_action != monthly_action:
-						compare_expense_with_budget(args, budget.cost_center,
-							flt(budget.budget_amount), _("Annual"), yearly_action)
+			if monthly_action in ["Stop", "Warn"]:
+				budget_amount = get_accumulated_monthly_budget(budget.monthly_distribution,
+					args.posting_date, args.fiscal_year, budget.budget_amount)
+				args["month_end_date"] = get_last_day(args.posting_date)
 
-def compare_expense_with_budget(args, cost_center, budget_amount, action_for, action):
-	actual_expense = get_actual_expense(args, cost_center)
+				compare_expense_with_budget(args, budget_amount, 
+					_("Accumulated Monthly"), monthly_action, budget.budget_against)
+
+			if yearly_action in ("Stop", "Warn") and monthly_action != "Stop" \
+				and yearly_action != monthly_action:
+				compare_expense_with_budget(args, flt(budget.budget_amount), 
+						_("Annual"), yearly_action, budget.budget_against)
+
+
+def compare_expense_with_budget(args, budget_amount, action_for, action, budget_against):
+	actual_expense = get_actual_expense(args)
 	if actual_expense > budget_amount:
 		diff = actual_expense - budget_amount
-		currency = frappe.db.get_value('Company', frappe.db.get_value('Cost Center',
-			cost_center, 'company'), 'default_currency')
+		currency = frappe.db.get_value('Company', args.company, 'default_currency')
 
-		msg = _("{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4}").format(_(action_for),
-			frappe.bold(args.account), frappe.bold(cost_center),
-			frappe.bold(fmt_money(budget_amount, currency=currency)), frappe.bold(fmt_money(diff, currency=currency)))
+		msg = _("{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5}").format(
+				_(action_for), frappe.bold(args.account), args.budget_against_field, 
+				frappe.bold(budget_against),
+				frappe.bold(fmt_money(budget_amount, currency=currency)), 
+				frappe.bold(fmt_money(diff, currency=currency)))
 
 		if action=="Stop":
 			frappe.throw(msg, BudgetError)
 		else:
 			frappe.msgprint(msg, indicator='orange')
 
+
+def get_actual_expense(args):
+	condition1 = " and gle.posting_date <= %(month_end_date)s" \
+		if args.get("month_end_date") else ""
+	if args.budget_against_field == "Cost Center":
+		lft_rgt = frappe.db.get_value(args.budget_against_field, 
+			args.budget_against, ["lft", "rgt"], as_dict=1)
+		args.update(lft_rgt)
+		condition2 = """and exists(select name from `tabCost Center` 
+			where lft>=%(lft)s and rgt<=%(rgt)s and name=gle.cost_center)"""
+	
+	elif args.budget_against_field == "Project":
+		condition2 = "and exists(select name from `tabProject` where name=gle.project)"
+
+	return flt(frappe.db.sql("""
+		select sum(gle.debit) - sum(gle.credit)
+		from `tabGL Entry` gle
+		where gle.account=%(account)s
+			{condition1}
+			and gle.fiscal_year=%(fiscal_year)s
+			and gle.company=%(company)s
+			and gle.docstatus=1
+			{condition2}
+	""".format(condition1=condition1, condition2=condition2), (args))[0][0])
+
+
 def get_accumulated_monthly_budget(monthly_distribution, posting_date, fiscal_year, annual_budget):
 	distribution = {}
 	if monthly_distribution:
@@ -118,21 +182,3 @@ def get_accumulated_monthly_budget(monthly_distribution, posting_date, fiscal_ye
 		dt = add_months(dt, 1)
 
 	return annual_budget * accumulated_percentage / 100
-
-def get_actual_expense(args, cost_center):
-	lft_rgt = frappe.db.get_value("Cost Center", cost_center, ["lft", "rgt"], as_dict=1)
-	args.update(lft_rgt)
-
-	condition = " and gle.posting_date <= %(month_end_date)s" if args.get("month_end_date") else ""
-
-	return flt(frappe.db.sql("""
-		select sum(gle.debit) - sum(gle.credit)
-		from `tabGL Entry` gle
-		where gle.account=%(account)s
-			and exists(select name from `tabCost Center`
-				where lft>=%(lft)s and rgt<=%(rgt)s and name=gle.cost_center)
-			and gle.fiscal_year=%(fiscal_year)s
-			and gle.company=%(company)s
-			and gle.docstatus=1
-			{condition}
-	""".format(condition=condition), (args))[0][0])

erpnext/accounts/doctype/budget/test_budget.py

@@ -10,9 +10,9 @@ from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journ
 
 class TestBudget(unittest.TestCase):		
 	def test_monthly_budget_crossed_ignore(self):
-		set_total_expense_zero("2013-02-28")
+		set_total_expense_zero("2013-02-28", "Cost Center")
 
-		budget = make_budget()
+		budget = make_budget("Cost Center")
 		
 		jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC", 40000, "_Test Cost Center - _TC", submit=True)
@@ -22,10 +22,10 @@ class TestBudget(unittest.TestCase):
 			
 		budget.cancel()
 
-	def test_monthly_budget_crossed_stop(self):
-		set_total_expense_zero("2013-02-28")
+	def test_monthly_budget_crossed_stop1(self):
+		set_total_expense_zero("2013-02-28", "Cost Center")
 
-		budget = make_budget()
+		budget = make_budget("Cost Center")
 		
 		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
 
@@ -37,10 +37,25 @@ class TestBudget(unittest.TestCase):
 		budget.load_from_db()
 		budget.cancel()
 
-	def test_yearly_budget_crossed_stop(self):
-		set_total_expense_zero("2013-02-28")
+	def test_monthly_budget_crossed_stop2(self):
+		set_total_expense_zero("2013-02-28", "Project")
 
-		budget = make_budget()
+		budget = make_budget("Project")
+		
+		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
+
+		jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
+			"_Test Bank - _TC", 40000, "_Test Cost Center - _TC", project="_Test Project")
+
+		self.assertRaises(BudgetError, jv.submit)
+		
+		budget.load_from_db()
+		budget.cancel()
+
+	def test_yearly_budget_crossed_stop1(self):
+		set_total_expense_zero("2013-02-28", "Cost Center")
+
+		budget = make_budget("Cost Center")
 		
 		jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC", 150000, "_Test Cost Center - _TC")
@@ -49,10 +64,22 @@ class TestBudget(unittest.TestCase):
 		
 		budget.cancel()
 
-	def test_monthly_budget_on_cancellation(self):
-		set_total_expense_zero("2013-02-28")
+	def test_yearly_budget_crossed_stop2(self):
+		set_total_expense_zero("2013-02-28", "Project")
 
-		budget = make_budget()
+		budget = make_budget("Project")
+		
+		jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
+			"_Test Bank - _TC", 150000, "_Test Cost Center - _TC", project="_Test Project")
+
+		self.assertRaises(BudgetError, jv.submit)
+		
+		budget.cancel()
+
+	def test_monthly_budget_on_cancellation1(self):
+		set_total_expense_zero("2013-02-28", "Cost Center")
+
+		budget = make_budget("Cost Center")
 				
 		jv1 = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC", 20000, "_Test Cost Center - _TC", submit=True)
@@ -72,12 +99,37 @@ class TestBudget(unittest.TestCase):
 		
 		budget.load_from_db()
 		budget.cancel()
+
+	def test_monthly_budget_on_cancellation2(self):
+		set_total_expense_zero("2013-02-28", "Project")
+
+		budget = make_budget("Project")
+				
+		jv1 = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
+			"_Test Bank - _TC", 20000, "_Test Cost Center - _TC", submit=True, project="_Test Project")
+
+		self.assertTrue(frappe.db.get_value("GL Entry",
+			{"voucher_type": "Journal Entry", "voucher_no": jv1.name}))
+
+		jv2 = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
+			"_Test Bank - _TC", 20000, "_Test Cost Center - _TC", submit=True, project="_Test Project")
+
+		self.assertTrue(frappe.db.get_value("GL Entry",
+			{"voucher_type": "Journal Entry", "voucher_no": jv2.name}))
+
+		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
+		
+		self.assertRaises(BudgetError, jv1.cancel)
+		
+		budget.load_from_db()
+		budget.cancel()
+
 		
 	def test_monthly_budget_against_group_cost_center(self):
-		set_total_expense_zero("2013-02-28")
-		set_total_expense_zero("2013-02-28", "_Test Cost Center 2 - _TC")
+		set_total_expense_zero("2013-02-28", "Cost Center")
+		set_total_expense_zero("2013-02-28", "Cost Center", "_Test Cost Center 2 - _TC")
 		
-		budget = make_budget("_Test Company - _TC")
+		budget = make_budget("Cost Center", "_Test Company - _TC")
 		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
 
 		jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
@@ -88,27 +140,80 @@ class TestBudget(unittest.TestCase):
 		budget.load_from_db()
 		budget.cancel()
 
-def set_total_expense_zero(posting_date, cost_center=None):
-	existing_expense = get_actual_expense({
+	def test_monthly_budget_against_parent_group_cost_center(self):
+		cost_center = "_Test Cost Center 3 - _TC"
+
+		if not frappe.db.exists("Cost Center", cost_center):
+			frappe.get_doc({
+				'doctype': 'Cost Center',
+				'cost_center_name': '_Test Cost Center 3',
+				'parent_cost_center': "_Test Company - _TC",
+				'company': '_Test Company',
+				'is_group': 0
+			}).insert(ignore_permissions=True)
+
+		budget = make_budget("Cost Center", cost_center)
+		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
+
+		jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
+			"_Test Bank - _TC", 40000, cost_center)
+
+		self.assertRaises(BudgetError, jv.submit)
+
+		budget.load_from_db()
+		budget.cancel()
+		jv.cancel()
+
+		frappe.delete_doc('Journal Entry', jv.name)
+		frappe.delete_doc('Cost Center', cost_center)
+
+def set_total_expense_zero(posting_date, budget_against_field=None, budget_against_CC=None):
+	if budget_against_field == "Project":
+		budget_against = "_Test Project"
+	else:
+		budget_against = budget_against_CC or "_Test Cost Center - _TC"
+	existing_expense = get_actual_expense(frappe._dict({
 		"account": "_Test Account Cost for Goods Sold - _TC",
-		"cost_center": cost_center or "_Test Cost Center - _TC",
+		"cost_center": "_Test Cost Center - _TC",
 		"monthly_end_date": posting_date,
 		"company": "_Test Company",
-		"fiscal_year": "_Test Fiscal Year 2013"
-	}, cost_center or "_Test Cost Center - _TC")
+		"fiscal_year": "_Test Fiscal Year 2013",
+		"budget_against_field": budget_against_field,
+		"budget_against": budget_against
+	}))
 	
-	make_journal_entry("_Test Account Cost for Goods Sold - _TC",
-		"_Test Bank - _TC", -existing_expense, "_Test Cost Center - _TC", submit=True)
+	if existing_expense:
+		if budget_against_field == "Cost Center":
+			make_journal_entry("_Test Account Cost for Goods Sold - _TC",
+			"_Test Bank - _TC", -existing_expense, "_Test Cost Center - _TC", submit=True)
+		elif budget_against_field == "Project":
+			make_journal_entry("_Test Account Cost for Goods Sold - _TC",
+			"_Test Bank - _TC", -existing_expense, "_Test Cost Center - _TC", submit=True, project="_Test Project")
 		
-def make_budget(cost_center=None):
+def make_budget(budget_against=None, cost_center=None):
+	if budget_against == "Project":
+		budget_list = frappe.get_all("Budget", fields=["name"], filters = {"name": ("like", "_Test Project/_Test Fiscal Year 2013%")})
+	else:
+		cost_center_name = "{0}%".format(cost_center or "_Test Cost Center - _TC/_Test Fiscal Year 2013")
+		budget_list = frappe.get_all("Budget", fields=["name"], filters = {"name": ("like", cost_center_name)})
+	for d in budget_list:
+		frappe.db.sql("delete from `tabBudget` where name = %(name)s", d)
+		frappe.db.sql("delete from `tabBudget Account` where parent = %(name)s", d)
+
 	budget = frappe.new_doc("Budget")
-	budget.cost_center = cost_center or "_Test Cost Center - _TC"
+	
+	if budget_against == "Project":
+		budget.project = "_Test Project"
+	else:
+		budget.cost_center =cost_center or "_Test Cost Center - _TC"
+	
+	
 	budget.fiscal_year = "_Test Fiscal Year 2013"
 	budget.monthly_distribution = "_Test Distribution"
 	budget.company = "_Test Company"
 	budget.action_if_annual_budget_exceeded = "Stop"
 	budget.action_if_accumulated_monthly_budget_exceeded = "Ignore"
-	
+	budget.budget_against = budget_against
 	budget.append("accounts", {
 		"account": "_Test Account Cost for Goods Sold - _TC",
 		"budget_amount": 100000

erpnext/accounts/doctype/budget_account/budget_account.json

@@ -9,11 +9,13 @@
  "doctype": "DocType", 
  "document_type": "", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "account", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -30,6 +32,7 @@
    "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, 
@@ -40,6 +43,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "budget_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -50,11 +54,13 @@
    "label": "Budget 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, 
@@ -72,7 +78,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-11 03:27:58.705376", 
+ "modified": "2017-01-02 17:02:53.339420", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Budget Account", 

erpnext/accounts/doctype/c_form/c_form.json

@@ -1,24 +1,31 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
+ "beta": 0, 
  "creation": "2013-03-07 11:55:06", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break0", 
    "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, 
@@ -26,6 +33,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -34,16 +42,20 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "naming_series", 
    "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": "Series", 
    "length": 0, 
    "no_copy": 0, 
@@ -52,23 +64,28 @@
    "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, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "c_form_no", 
    "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": "C-Form No", 
    "length": 0, 
    "no_copy": 0, 
@@ -76,6 +93,7 @@
    "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, 
@@ -83,16 +101,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "received_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": "Received Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -100,6 +122,7 @@
    "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, 
@@ -107,16 +130,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "customer", 
    "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": "Customer", 
    "length": 0, 
    "no_copy": 0, 
@@ -125,6 +152,7 @@
    "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, 
@@ -132,16 +160,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break1", 
    "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, 
@@ -149,6 +181,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -157,16 +190,20 @@
    "width": "50%"
   }, 
   {
+   "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": 0, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -175,6 +212,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 1, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -182,16 +220,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "quarter", 
    "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": 1, 
    "label": "Quarter", 
    "length": 0, 
    "no_copy": 0, 
@@ -200,6 +242,7 @@
    "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, 
@@ -207,16 +250,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_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": "Total Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -225,6 +272,7 @@
    "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, 
@@ -232,16 +280,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "state", 
    "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": "State", 
    "length": 0, 
    "no_copy": 0, 
@@ -249,6 +301,7 @@
    "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, 
@@ -256,22 +309,27 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break0", 
    "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, 
    "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, 
@@ -279,16 +337,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "invoices", 
    "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": "Invoices", 
    "length": 0, 
    "no_copy": 0, 
@@ -297,6 +359,7 @@
    "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, 
@@ -304,16 +367,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_invoiced_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": "Total Invoiced Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -322,6 +389,7 @@
    "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, 
@@ -329,16 +397,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 1, 
    "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, 
@@ -347,6 +419,7 @@
    "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, 
@@ -354,17 +427,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-file-text", 
+ "icon": "fa fa-file-text", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 3, 
- "modified": "2016-03-03 04:31:05.340444", 
+ "modified": "2017-06-13 14:28:56.667292", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "C-Form", 
@@ -431,8 +505,12 @@
    "write": 0
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_order": "DESC", 
- "timeline_field": "customer"
+ "timeline_field": "customer", 
+ "track_changes": 0, 
+ "track_seen": 0
 }

erpnext/accounts/doctype/cheque_print_template/cheque_print_template.py

@@ -35,7 +35,7 @@ def create_or_update_cheque_print_format(template_name):
 		</span>
 		<span style="top:%(date_dist_from_top_edge)s cm; left:%(date_dist_from_left_edge)scm;
 			position: absolute;">
-			{{doc.reference_date or '' }}
+			{{ frappe.utils.formatdate(doc.reference_date) or '' }}
 		</span>
 		<span style="top:%(acc_no_dist_from_top_edge)scm;left:%(acc_no_dist_from_left_edge)scm;
 			position: absolute;">

erpnext/accounts/doctype/cost_center/cost_center.js

@@ -43,18 +43,18 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) {
 
 cur_frm.cscript.parent_cost_center = function(doc, cdt, cdn) {
 	if(!doc.company){
-		msgprint(__('Please enter company name first'));
+		frappe.msgprint(__('Please enter company name first'));
 	}
 }
 
 cur_frm.cscript.hide_unhide_group_ledger = function(doc) {
 	if (doc.is_group == 1) {
 		cur_frm.add_custom_button(__('Convert to Non-Group'),
-			function() { cur_frm.cscript.convert_to_ledger(); }, "icon-retweet",
+			function() { cur_frm.cscript.convert_to_ledger(); }, "fa fa-retweet",
 				"btn-default")
 	} else if (doc.is_group == 0) {
 		cur_frm.add_custom_button(__('Convert to Group'),
-			function() { cur_frm.cscript.convert_to_group(); }, "icon-retweet",
+			function() { cur_frm.cscript.convert_to_group(); }, "fa fa-retweet",
 				"btn-default")
 	}
 }

erpnext/accounts/doctype/cost_center/cost_center.json

@@ -10,18 +10,22 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "sb0", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -29,6 +33,7 @@
    "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, 
@@ -39,13 +44,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "cost_center_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Cost Center Name", 
    "length": 0, 
    "no_copy": 1, 
@@ -55,6 +63,7 @@
    "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, 
@@ -65,13 +74,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "parent_cost_center", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 1, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Parent Cost Center", 
    "length": 0, 
    "no_copy": 0, 
@@ -82,6 +94,7 @@
    "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, 
@@ -92,13 +105,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -109,6 +125,7 @@
    "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, 
@@ -119,19 +136,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "cb0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -143,6 +164,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "0", 
    "fieldname": "is_group", 
    "fieldtype": "Check", 
@@ -150,7 +172,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -159,6 +183,7 @@
    "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, 
@@ -169,13 +194,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "lft", 
    "fieldtype": "Int", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "lft", 
    "length": 0, 
    "no_copy": 1, 
@@ -185,6 +213,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 1, 
@@ -195,13 +224,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "rgt", 
    "fieldtype": "Int", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "rgt", 
    "length": 0, 
    "no_copy": 1, 
@@ -211,6 +243,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 1, 
@@ -221,13 +254,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "old_parent", 
    "fieldtype": "Link", 
    "hidden": 1, 
    "ignore_user_permissions": 1, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "old_parent", 
    "length": 0, 
    "no_copy": 1, 
@@ -238,6 +274,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -247,8 +284,9 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-money", 
+ "icon": "fa fa-money", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
@@ -256,7 +294,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-05-16 15:23:14.770933", 
+ "modified": "2017-02-17 16:22:27.129572", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Cost Center", 
@@ -367,7 +405,8 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "parent_cost_center, is_group", 
+ "show_name_in_global_search": 1, 
  "sort_order": "ASC", 
- "track_seen": 0, 
- "version": 0
+ "track_changes": 0, 
+ "track_seen": 0
 }

erpnext/accounts/doctype/cost_center/cost_center_tree.js

@@ -22,5 +22,6 @@ frappe.treeview_settings["Cost Center"] = {
 		{fieldtype:'Data', fieldname:'cost_center_name', label:__('New Cost Center Name'), reqd:true},
 		{fieldtype:'Check', fieldname:'is_group', label:__('Is Group'),
 			description:__('Further cost centers can be made under Groups but entries can be made against non-Groups')}
-	]
+	],
+	ignore_fields:["parent_cost_center"]
 }

erpnext/accounts/doctype/depreciation_schedule/depreciation_schedule.json

@@ -10,11 +10,13 @@
  "doctype": "DocType", 
  "document_type": "Document", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "schedule_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -29,7 +31,8 @@
    "precision": "", 
    "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, 
@@ -40,6 +43,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "depreciation_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -55,7 +59,8 @@
    "precision": "", 
    "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, 
@@ -66,6 +71,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -80,6 +86,7 @@
    "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, 
@@ -90,6 +97,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "accumulated_depreciation_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -106,8 +114,9 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -116,6 +125,8 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.docstatus==1", 
    "fieldname": "journal_entry", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -132,6 +143,7 @@
    "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, 
@@ -142,7 +154,8 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "eval:(!doc.journal_entry && doc.schedule_date <= get_today())", 
+   "columns": 0, 
+   "depends_on": "eval:(doc.docstatus==1 && !doc.journal_entry && doc.schedule_date <= get_today())", 
    "fieldname": "make_depreciation_entry", 
    "fieldtype": "Button", 
    "hidden": 0, 
@@ -158,6 +171,7 @@
    "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, 
@@ -175,7 +189,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-11 03:27:59.603924", 
+ "modified": "2016-11-18 16:42:19.543657", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Depreciation Schedule", 

erpnext/accounts/doctype/fiscal_year/fiscal_year.js

@@ -13,9 +13,9 @@ $.extend(cur_frm.cscript, {
 		this.frm.toggle_enable('year_start_date', doc.__islocal)
 		this.frm.toggle_enable('year_end_date', doc.__islocal)
 
-		if (!doc.__islocal && (doc.name != sys_defaults.fiscal_year)) {
+		if (!doc.__islocal && (doc.name != frappe.sys_defaults.fiscal_year)) {
 			this.frm.add_custom_button(__("Default"),
-				this.frm.cscript.set_as_default, "icon-star");
+				this.frm.cscript.set_as_default, "fa fa-star");
 			this.frm.set_intro(__("To set this Fiscal Year as Default, click on 'Set as Default'"));
 		} else {
 			this.frm.set_intro("");
@@ -30,7 +30,7 @@ $.extend(cur_frm.cscript, {
 	year_start_date: function(doc, dt, dn) {
 		var me = this;
 
-		year_end_date =
+		var year_end_date =
 			frappe.datetime.add_days(frappe.datetime.add_months(this.frm.doc.year_start_date, 12), -1);
 		this.frm.set_value("year_end_date", year_end_date);
 	},

erpnext/accounts/doctype/fiscal_year/fiscal_year.json

@@ -3,24 +3,30 @@
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "field:year", 
+ "beta": 0, 
  "creation": "2013-01-22 16:50:25", 
  "custom": 0, 
  "description": "**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "For e.g. 2012, 2012-13", 
    "fieldname": "year", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Year Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -28,7 +34,9 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -39,19 +47,25 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "disabled", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Disabled", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -62,12 +76,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "year_start_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Year Start Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -75,7 +93,9 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -86,18 +106,24 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "year_end_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Year End Date", 
    "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -108,12 +134,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "companies", 
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Companies", 
    "length": 0, 
    "no_copy": 0, 
@@ -121,7 +151,9 @@
    "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, 
@@ -131,15 +163,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-calendar", 
+ "icon": "fa fa-calendar", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:47.289982", 
+ "modified": "2017-02-17 16:22:08.431278", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Fiscal Year", 
@@ -266,8 +299,12 @@
    "write": 0
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_field": "name", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
 }

erpnext/accounts/doctype/fiscal_year/fiscal_year.py

@@ -43,11 +43,13 @@ class FiscalYear(Document):
 
 	def on_update(self):
 		check_duplicate_fiscal_year(self)
+		frappe.cache().delete_value("fiscal_years")
 	
 	def on_trash(self):
 		global_defaults = frappe.get_doc("Global Defaults")
 		if global_defaults.current_fiscal_year == self.name:
 			frappe.throw(_("You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings").format(self.name))
+		frappe.cache().delete_value("fiscal_years")
 
 	def validate_overlap(self):
 		existing_fiscal_years = frappe.db.sql("""select name from `tabFiscal Year`

erpnext/accounts/doctype/gl_entry/gl_entry.json

@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "GL.#######", 
@@ -8,18 +9,24 @@
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "posting_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Posting Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -29,6 +36,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -36,16 +44,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "transaction_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": "Transaction Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -55,6 +67,7 @@
    "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, 
@@ -62,16 +75,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 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": 1, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -82,6 +99,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -89,16 +107,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "party_type", 
    "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": "Party Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -107,6 +129,7 @@
    "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, 
@@ -114,16 +137,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "party", 
    "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": 1, 
    "label": "Party", 
    "length": 0, 
    "no_copy": 0, 
@@ -132,6 +159,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -139,16 +167,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "cost_center", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Cost Center", 
    "length": 0, 
    "no_copy": 0, 
@@ -159,6 +191,7 @@
    "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, 
@@ -166,16 +199,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "debit", 
    "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": "Debit Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -187,6 +224,7 @@
    "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, 
@@ -194,16 +232,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "credit", 
    "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": "Credit Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -215,6 +257,7 @@
    "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, 
@@ -222,16 +265,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "account_currency", 
    "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 Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -241,6 +288,7 @@
    "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, 
@@ -248,16 +296,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "debit_in_account_currency", 
    "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": "Debit Amount in Account Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -267,6 +319,7 @@
    "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, 
@@ -274,16 +327,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "credit_in_account_currency", 
    "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": "Credit Amount in Account Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -293,6 +350,7 @@
    "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, 
@@ -300,16 +358,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "against", 
    "fieldtype": "Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Against", 
    "length": 0, 
    "no_copy": 0, 
@@ -319,6 +381,7 @@
    "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, 
@@ -326,16 +389,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "against_voucher_type", 
    "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": "Against Voucher Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -346,6 +413,7 @@
    "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, 
@@ -353,16 +421,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "against_voucher", 
    "fieldtype": "Dynamic Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Against Voucher", 
    "length": 0, 
    "no_copy": 0, 
@@ -373,6 +445,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -380,16 +453,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "voucher_type", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Voucher Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -400,6 +477,7 @@
    "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, 
@@ -407,16 +485,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "voucher_no", 
    "fieldtype": "Dynamic Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Voucher No", 
    "length": 0, 
    "no_copy": 0, 
@@ -427,6 +509,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -434,16 +517,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "project", 
    "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": "Project", 
    "length": 0, 
    "no_copy": 0, 
@@ -453,6 +540,7 @@
    "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, 
@@ -460,16 +548,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "remarks", 
    "fieldtype": "Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Remarks", 
    "length": 0, 
    "no_copy": 1, 
@@ -479,6 +571,7 @@
    "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, 
@@ -486,16 +579,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "is_opening", 
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Opening", 
    "length": 0, 
    "no_copy": 0, 
@@ -506,6 +603,7 @@
    "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, 
@@ -513,16 +611,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "is_advance", 
    "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": "Is Advance", 
    "length": 0, 
    "no_copy": 0, 
@@ -533,6 +635,7 @@
    "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, 
@@ -540,16 +643,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "fiscal_year", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Fiscal Year", 
    "length": 0, 
    "no_copy": 0, 
@@ -560,6 +667,7 @@
    "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, 
@@ -567,16 +675,20 @@
    "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": 1, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -587,6 +699,7 @@
    "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, 
@@ -594,17 +707,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-list", 
+ "icon": "fa fa-list", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 1, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-05-26 16:22:03.094536", 
+ "modified": "2017-08-03 12:40:09.611951", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "GL Entry", 
@@ -675,7 +789,9 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "voucher_no,account,posting_date,against_voucher", 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }

erpnext/accounts/doctype/gl_entry/gl_entry.py

@@ -2,13 +2,12 @@
 # License: GNU General Public License v3. See license.txt
 
 from __future__ import unicode_literals
-import frappe
+import frappe, erpnext
 from frappe import _
 from frappe.utils import flt, fmt_money, getdate, formatdate
 from frappe.model.document import Document
 from erpnext.accounts.party import validate_party_gle_currency, validate_party_frozen_disabled
 from erpnext.accounts.utils import get_account_currency
-from erpnext.setup.doctype.company.company import get_company_currency
 from erpnext.accounts.utils import get_fiscal_year
 from erpnext.exceptions import InvalidAccountCurrency
 
@@ -18,22 +17,27 @@ class GLEntry(Document):
 	def validate(self):
 		self.flags.ignore_submit_comment = True
 		self.check_mandatory()
-		self.pl_must_have_cost_center()
-		self.check_pl_account()
-		self.validate_cost_center()
-		self.validate_party()
-		self.validate_currency()
 		self.validate_and_set_fiscal_year()
 
-	def on_update_with_args(self, adv_adj, update_outstanding = 'Yes'):
-		self.validate_account_details(adv_adj)
+		if not self.flags.from_repost:
+			self.pl_must_have_cost_center()
+			self.check_pl_account()
+			self.validate_cost_center()
+			self.validate_party()
+			self.validate_currency()
+
+
+	def on_update_with_args(self, adv_adj, update_outstanding = 'Yes', from_repost=False):
+		if not from_repost:
+			self.validate_account_details(adv_adj)
+			check_freezing_date(self.posting_date, adv_adj)
+
 		validate_frozen_account(self.account, adv_adj)
-		check_freezing_date(self.posting_date, adv_adj)
 		validate_balance_type(self.account, adv_adj)
 
 		# Update outstanding amt on against voucher
-		if self.against_voucher_type in ['Journal Entry', 'Sales Invoice', 'Purchase Invoice'] \
-			and self.against_voucher and update_outstanding == 'Yes':
+		if self.against_voucher_type in ['Journal Entry', 'Sales Invoice', 'Purchase Invoice', 'Fees'] \
+			and self.against_voucher and update_outstanding == 'Yes' and not from_repost:
 				update_outstanding_amt(self.account, self.party_type, self.party, self.against_voucher_type,
 					self.against_voucher)
 
@@ -44,18 +48,24 @@ class GLEntry(Document):
 				frappe.throw(_("{0} is required").format(_(self.meta.get_label(k))))
 
 		account_type = frappe.db.get_value("Account", self.account, "account_type")
-		if account_type in ["Receivable", "Payable"] and not (self.party_type and self.party):
-			frappe.throw(_("Party Type and Party is required for Receivable / Payable account {0}").format(self.account))
+		if not (self.party_type and self.party):
+			if account_type == "Receivable":
+				frappe.throw(_("{0} {1}: Customer is required against Receivable account {2}")
+					.format(self.voucher_type, self.voucher_no, self.account))
+			elif account_type == "Payable":
+				frappe.throw(_("{0} {1}: Supplier is required against Payable account {2}")
+					.format(self.voucher_type, self.voucher_no, self.account))
 
 		# Zero value transaction is not allowed
 		if not (flt(self.debit) or flt(self.credit)):
-			frappe.throw(_("Either debit or credit amount is required for {0}").format(self.account))
+			frappe.throw(_("{0} {1}: Either debit or credit amount is required for {2}")
+				.format(self.voucher_type, self.voucher_no, self.account))
 
 	def pl_must_have_cost_center(self):
 		if frappe.db.get_value("Account", self.account, "report_type") == "Profit and Loss":
 			if not self.cost_center and self.voucher_type != 'Period Closing Voucher':
-				frappe.throw(_("Cost Center is required for 'Profit and Loss' account {0}")
-					.format(self.account))
+				frappe.throw(_("{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.")
+					.format(self.voucher_type, self.voucher_no, self.account))
 		else:
 			if self.cost_center:
 				self.cost_center = None
@@ -65,7 +75,8 @@ class GLEntry(Document):
 	def check_pl_account(self):
 		if self.is_opening=='Yes' and \
 				frappe.db.get_value("Account", self.account, "report_type")=="Profit and Loss":
-			frappe.throw(_("'Profit and Loss' type account {0} not allowed in Opening Entry").format(self.account))
+			frappe.throw(_("{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry")
+				.format(self.voucher_type, self.voucher_no, self.account))
 
 	def validate_account_details(self, adv_adj):
 		"""Account must be ledger, active and not freezed"""
@@ -74,13 +85,16 @@ class GLEntry(Document):
 			from tabAccount where name=%s""", self.account, as_dict=1)[0]
 
 		if ret.is_group==1:
-			frappe.throw(_("Account {0} cannot be a Group").format(self.account))
+			frappe.throw(_("{0} {1}: Account {2} cannot be a Group")
+				.format(self.voucher_type, self.voucher_no, self.account))
 
 		if ret.docstatus==2:
-			frappe.throw(_("Account {0} is inactive").format(self.account))
+			frappe.throw(_("{0} {1}: Account {2} is inactive")
+				.format(self.voucher_type, self.voucher_no, self.account))
 
 		if ret.company != self.company:
-			frappe.throw(_("Account {0} does not belong to Company {1}").format(self.account, self.company))
+			frappe.throw(_("{0} {1}: Account {2} does not belong to Company {3}")
+				.format(self.voucher_type, self.voucher_no, self.account, self.company))
 
 	def validate_cost_center(self):
 		if not hasattr(self, "cost_center_company"):
@@ -94,21 +108,23 @@ class GLEntry(Document):
 			return self.cost_center_company[self.cost_center]
 
 		if self.cost_center and _get_cost_center_company() != self.company:
-			frappe.throw(_("Cost Center {0} does not belong to Company {1}").format(self.cost_center, self.company))
+			frappe.throw(_("{0} {1}: Cost Center {2} does not belong to Company {3}")
+				.format(self.voucher_type, self.voucher_no, self.cost_center, self.company))
 
 	def validate_party(self):
 		validate_party_frozen_disabled(self.party_type, self.party)
 
 	def validate_currency(self):
-		company_currency = get_company_currency(self.company)
+		company_currency = erpnext.get_company_currency(self.company)
 		account_currency = get_account_currency(self.account)
 
 		if not self.account_currency:
 			self.account_currency = company_currency
 
 		if account_currency != self.account_currency:
-			frappe.throw(_("Accounting Entry for {0} can only be made in currency: {1}")
-				.format(self.account, (account_currency or company_currency)), InvalidAccountCurrency)
+			frappe.throw(_("{0} {1}: Accounting Entry for {2} can only be made in currency: {3}")
+				.format(self.voucher_type, self.voucher_no, self.account,
+				(account_currency or company_currency)), InvalidAccountCurrency)
 
 		if self.party_type and self.party:
 			validate_party_gle_currency(self.party_type, self.party, self.company, self.account_currency)
@@ -180,9 +196,10 @@ def update_outstanding_amt(account, party_type, party, against_voucher_type, aga
 			frappe.throw(_("Outstanding for {0} cannot be less than zero ({1})").format(against_voucher, fmt_money(bal)))
 
 	# Update outstanding amt on against voucher
-	if against_voucher_type in ["Sales Invoice", "Purchase Invoice"]:
+	if against_voucher_type in ["Sales Invoice", "Purchase Invoice", "Fees"]:
 		ref_doc = frappe.get_doc(against_voucher_type, against_voucher)
 		ref_doc.db_set('outstanding_amount', bal)
+		ref_doc.set_status(update=True)
 
 def validate_frozen_account(account, adv_adj=None):
 	frozen_account = frappe.db.get_value("Account", account, "freeze_account")

erpnext/accounts/doctype/gl_entry/test_gl_entry.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: GL Entry", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially('GL Entry', [
+		// insert a new GL Entry
+		() => frappe.tests.make([
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});

erpnext/accounts/doctype/journal_entry/journal_entry.js

@@ -6,15 +6,6 @@ frappe.provide("erpnext.journal_entry");
 
 
 frappe.ui.form.on("Journal Entry", {
-	setup: function(frm) {
-		frm.get_field('accounts').grid.editable_fields = [
-			{fieldname: 'account', columns: 3},
-			{fieldname: 'party', columns: 3},
-			{fieldname: 'debit_in_account_currency', columns: 2},
-			{fieldname: 'credit_in_account_currency', columns: 2}
-		];
-	},
-
 	refresh: function(frm) {
 		erpnext.toggle_naming_series();
 		frm.cscript.voucher_type(frm.doc);
@@ -29,7 +20,7 @@ frappe.ui.form.on("Journal Entry", {
 					group_by_voucher: 0
 				};
 				frappe.set_route("query-report", "General Ledger");
-			}, "icon-table");
+			}, "fa fa-table");
 		}
 
 		if (frm.doc.__islocal) {
@@ -44,8 +35,34 @@ frappe.ui.form.on("Journal Entry", {
 
 	multi_currency: function(frm) {
 		erpnext.journal_entry.toggle_fields_based_on_currency(frm);
+	},
+	
+	posting_date: function(frm) {
+		if(!frm.doc.multi_currency || !frm.doc.posting_date) return;
+		
+		$.each(frm.doc.accounts || [], function(i, row) {
+			erpnext.journal_entry.set_exchange_rate(frm, row.doctype, row.name);
+		})
+	},
+
+	company: function(frm) {
+		frappe.call({
+			method: "frappe.client.get_value",
+			args: {
+				doctype: "Company",
+				filters: {"name": frm.doc.company},
+				fieldname: "cost_center"
+			},
+			callback: function(r){
+				if(r.message){
+					$.each(frm.doc.accounts || [], function(i, jvd) {
+						frappe.model.set_value(jvd.doctype, jvd.name, "cost_center", r.message.cost_center);
+					});
+				}
+			}
+		});
 	}
-})
+});
 
 erpnext.accounts.JournalEntry = frappe.ui.form.Controller.extend({
 	onload: function() {
@@ -63,11 +80,10 @@ erpnext.accounts.JournalEntry = frappe.ui.form.Controller.extend({
 		if(this.frm.doc.__islocal && this.frm.doc.company) {
 			frappe.model.set_default_values(this.frm.doc);
 			$.each(this.frm.doc.accounts || [], function(i, jvd) {
-					frappe.model.set_default_values(jvd);
-				}
-			);
+				frappe.model.set_default_values(jvd);
+			});
 
-			if(!this.frm.doc.amended_from) this.frm.doc.posting_date = this.frm.posting_date || get_today();
+			if(!this.frm.doc.amended_from) this.frm.doc.posting_date = this.frm.posting_date || frappe.datetime.get_today();
 		}
 	},
 
@@ -87,9 +103,9 @@ erpnext.accounts.JournalEntry = frappe.ui.form.Controller.extend({
 			};
 		});
 
-		me.frm.set_query("party_type", "accounts", function(doc, cdt, cdn) {
-			return {
-				filters: {"name": ["in", ["Customer", "Supplier"]]}
+		me.frm.set_query("party_type", "accounts", function() {
+			return{
+				query: "erpnext.setup.doctype.party_type.party_type.get_party_type"
 			}
 		});
 
@@ -98,7 +114,14 @@ erpnext.accounts.JournalEntry = frappe.ui.form.Controller.extend({
 
 			// expense claim
 			if(jvd.reference_type==="Expense Claim") {
-				return {};
+				return {
+					filters: {
+						'approval_status': 'Approved',
+						'total_sanctioned_amount': ['>', 0],
+						'status': ['!=', 'Paid'],
+						'docstatus': 1
+					}
+				};
 			}
 
 			// journal entry
@@ -124,10 +147,11 @@ erpnext.accounts.JournalEntry = frappe.ui.form.Controller.extend({
 
 				// account filter
 				frappe.model.validate_missing(jvd, "account");
-
-				party_account_field = jvd.reference_type==="Sales Invoice" ? "debit_to": "credit_to";
+				var party_account_field = jvd.reference_type==="Sales Invoice" ? "debit_to": "credit_to";
 				out.filters.push([jvd.reference_type, party_account_field, "=", jvd.account]);
-			} else {
+			}
+
+			if(in_list(["Sales Order", "Purchase Order"], jvd.reference_type)) {
 				// party_type and party mandatory
 				frappe.model.validate_missing(jvd, "party_type");
 				frappe.model.validate_missing(jvd, "party");
@@ -244,7 +268,7 @@ cur_frm.cscript.update_totals = function(doc) {
 cur_frm.cscript.get_balance = function(doc,dt,dn) {
 	cur_frm.cscript.update_totals(doc);
 	return $c_obj(cur_frm.doc, 'get_balance', '', function(r, rt){
-	cur_frm.refresh();
+		cur_frm.refresh();
 	});
 }
 
@@ -268,7 +292,6 @@ cur_frm.cscript.voucher_type = function(doc, cdt, cdn) {
 	if(!doc.company) return;
 
 	var update_jv_details = function(doc, r) {
-		var jvdetail = frappe.model.add_child(doc, "Journal Entry Account", "accounts");
 		$.each(r, function(i, d) {
 			var row = frappe.model.add_child(doc, "Journal Entry Account", "accounts");
 			row.account = d.account;
@@ -276,8 +299,8 @@ cur_frm.cscript.voucher_type = function(doc, cdt, cdn) {
 		});
 		refresh_field("accounts");
 	}
-
-	if(!(doc.accounts || []).length) {
+	
+	if((!(doc.accounts || []).length) || ((doc.accounts || []).length==1 && !doc.accounts[0].account)) {
 		if(in_list(["Bank Entry", "Cash Entry"], doc.voucher_type)) {
 			return frappe.call({
 				type: "GET",
@@ -355,7 +378,7 @@ frappe.ui.form.on("Journal Entry Account", {
 			});
 		}
 	},
-
+	
 	debit_in_account_currency: function(frm, cdt, cdn) {
 		erpnext.journal_entry.set_exchange_rate(frm, cdt, cdn);
 	},
@@ -430,6 +453,7 @@ $.extend(erpnext.journal_entry, {
 			frappe.call({
 				method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_exchange_rate",
 				args: {
+					posting_date: frm.doc.posting_date,
 					account: row.account,
 					account_currency: row.account_currency,
 					company: frm.doc.company,

erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -2,17 +2,18 @@
 # License: GNU General Public License v3. See license.txt
 
 from __future__ import unicode_literals
-import frappe, json
+import frappe, erpnext, json
 from frappe.utils import cstr, flt, fmt_money, formatdate
 from frappe import msgprint, _, scrub
 from erpnext.controllers.accounts_controller import AccountsController
 from erpnext.accounts.utils import get_balance_on, get_account_currency
-from erpnext.setup.utils import get_company_currency
 from erpnext.accounts.party import get_party_account
+from erpnext.hr.doctype.expense_claim.expense_claim import update_reimbursed_amount
+from erpnext.hr.doctype.employee_loan.employee_loan import update_disbursement_status
 
 class JournalEntry(AccountsController):
-	def __init__(self, arg1, arg2=None):
-		super(JournalEntry, self).__init__(arg1, arg2)
+	def __init__(self, *args, **kwargs):
+		super(JournalEntry, self).__init__(*args, **kwargs)
 
 	def get_feed(self):
 		return self.voucher_type
@@ -45,6 +46,7 @@ class JournalEntry(AccountsController):
 		self.make_gl_entries()
 		self.update_advance_paid()
 		self.update_expense_claim()
+		self.update_employee_loan()
 
 	def get_title(self):
 		return self.pay_to_recd_from or self.accounts[0].account
@@ -52,7 +54,7 @@ class JournalEntry(AccountsController):
 	def update_advance_paid(self):
 		advance_paid = frappe._dict()
 		for d in self.get("accounts"):
-			if d.is_advance:
+			if d.is_advance == "Yes":
 				if d.reference_type in ("Sales Order", "Purchase Order"):
 					advance_paid.setdefault(d.reference_type, []).append(d.reference_name)
 
@@ -62,11 +64,36 @@ class JournalEntry(AccountsController):
 
 	def on_cancel(self):
 		from erpnext.accounts.utils import unlink_ref_doc_from_payment_entries
-		unlink_ref_doc_from_payment_entries(self.doctype, self.name)
-
+		from erpnext.hr.doctype.salary_slip.salary_slip import unlink_ref_doc_from_salary_slip
+		unlink_ref_doc_from_payment_entries(self)
+		unlink_ref_doc_from_salary_slip(self.name)
 		self.make_gl_entries(1)
 		self.update_advance_paid()
 		self.update_expense_claim()
+		self.update_employee_loan()
+		self.unlink_advance_entry_reference()
+		self.unlink_asset_reference()
+
+	def unlink_advance_entry_reference(self):
+		for d in self.get("accounts"):
+			if d.is_advance == "Yes" and d.reference_type in ("Sales Invoice", "Purchase Invoice"):
+				doc = frappe.get_doc(d.reference_type, d.reference_name)
+				doc.delink_advance_entries(self.name)
+				d.reference_type = ''
+				d.reference_name = ''
+				d.db_update()
+				
+	def unlink_asset_reference(self):
+		for d in self.get("accounts"):
+			if d.reference_type=="Asset" and d.reference_name:
+				asset = frappe.get_doc("Asset", d.reference_name)
+				for s in asset.get("schedules"):
+					if s.journal_entry == self.name:
+						s.db_set("journal_entry", None)
+						asset.value_after_depreciation += s.depreciation_amount
+
+						asset.db_set("value_after_depreciation", asset.value_after_depreciation)
+						asset.set_status()
 
 	def validate_party(self):
 		for d in self.get("accounts"):
@@ -310,9 +337,12 @@ class JournalEntry(AccountsController):
 			if d.account_currency == self.company_currency:
 				d.exchange_rate = 1
 			elif not d.exchange_rate or d.exchange_rate == 1 or \
-				(d.reference_type in ("Sales Invoice", "Purchase Invoice") and d.reference_name):
-					d.exchange_rate = get_exchange_rate(d.account, d.account_currency, self.company,
-						d.reference_type, d.reference_name, d.debit, d.credit, d.exchange_rate)
+				(d.reference_type in ("Sales Invoice", "Purchase Invoice")
+				and d.reference_name and self.posting_date):
+
+					# Modified to include the posting date for which to retreive the exchange rate
+					d.exchange_rate = get_exchange_rate(self.posting_date, d.account, d.account_currency,
+						self.company, d.reference_type, d.reference_name, d.debit, d.credit, d.exchange_rate)
 
 			if not d.exchange_rate:
 				frappe.throw(_("Row {0}: Exchange Rate is mandatory").format(d.idx))
@@ -356,7 +386,7 @@ class JournalEntry(AccountsController):
 		bank_amount = party_amount = total_amount = 0.0
 		currency = bank_account_currency = party_account_currency = pay_to_recd_from= None
 		for d in self.get('accounts'):
-			if d.party_type and d.party:
+			if d.party_type in ['Customer', 'Supplier'] and d.party:
 				if not pay_to_recd_from:
 					pay_to_recd_from = frappe.db.get_value(d.party_type, d.party,
 						"customer_name" if d.party_type=="Customer" else "supplier_name")
@@ -381,6 +411,7 @@ class JournalEntry(AccountsController):
 
 	def set_total_amount(self, amt, currency):
 		self.total_amount = amt
+		self.total_amount_currency = currency
 		from frappe.utils import money_in_words
 		self.total_amount_in_words = money_in_words(amt, currency)
 
@@ -416,7 +447,7 @@ class JournalEntry(AccountsController):
 		if not self.get('accounts'):
 			msgprint(_("'Entries' cannot be empty"), raise_exception=True)
 		else:
-			flag, self.total_debit, self.total_credit = 0, 0, 0
+			self.total_debit, self.total_credit = 0, 0
 			diff = flt(self.difference, self.precision("difference"))
 
 			# If any row without amount, set the diff on that row
@@ -483,11 +514,15 @@ class JournalEntry(AccountsController):
 
 	def update_expense_claim(self):
 		for d in self.accounts:
-			if d.reference_type=="Expense Claim":
-				amt = frappe.db.sql("""select sum(debit) as amt from `tabJournal Entry Account`
-					where reference_type = "Expense Claim" and
-					reference_name = %s and docstatus = 1""", d.reference_name ,as_dict=1)[0].amt
-				frappe.db.set_value("Expense Claim", d.reference_name , "total_amount_reimbursed", amt)
+			if d.reference_type=="Expense Claim" and d.reference_name:
+				doc = frappe.get_doc("Expense Claim", d.reference_name)
+				update_reimbursed_amount(doc)
+
+	def update_employee_loan(self):
+		for d in self.accounts:
+			if d.reference_type=="Employee Loan" and flt(d.debit) > 0:
+				doc = frappe.get_doc("Employee Loan", d.reference_name)
+				update_disbursement_status(doc)
 
 	def validate_expense_claim(self):
 		for d in self.accounts:
@@ -546,7 +581,7 @@ def get_default_bank_cash_account(company, account_type=None, mode_of_payment=No
 	if account:
 		account_details = frappe.db.get_value("Account", account,
 			["account_currency", "account_type"], as_dict=1)
-			
+
 		return frappe._dict({
 			"account": account,
 			"balance": get_balance_on(account),
@@ -631,7 +666,10 @@ def get_payment_entry(ref_doc, args):
 	cost_center = frappe.db.get_value("Company", ref_doc.company, "cost_center")
 	exchange_rate = 1
 	if args.get("party_account"):
-		exchange_rate = get_exchange_rate(args.get("party_account"), args.get("party_account_currency"),
+		# Modified to include the posting date for which the exchange rate is required.
+		# Assumed to be the posting date in the reference document
+		exchange_rate = get_exchange_rate(ref_doc.get("posting_date") or ref_doc.get("transaction_date"),
+			args.get("party_account"), args.get("party_account_currency"),
 			ref_doc.company, ref_doc.doctype, ref_doc.name)
 
 	je = frappe.new_doc("Journal Entry")
@@ -664,7 +702,10 @@ def get_payment_entry(ref_doc, args):
 	bank_account = get_default_bank_cash_account(ref_doc.company, "Bank", account=args.get("bank_account"))
 	if bank_account:
 		bank_row.update(bank_account)
-		bank_row.exchange_rate = get_exchange_rate(bank_account["account"],
+		# Modified to include the posting date for which the exchange rate is required.
+		# Assumed to be the posting date of the reference date
+		bank_row.exchange_rate = get_exchange_rate(ref_doc.get("posting_date")
+			or ref_doc.get("transaction_date"), bank_account["account"],
 			bank_account["account_currency"], ref_doc.company)
 
 	bank_row.cost_center = cost_center
@@ -689,8 +730,13 @@ def get_payment_entry(ref_doc, args):
 @frappe.whitelist()
 def get_opening_accounts(company):
 	"""get all balance sheet accounts for opening entry"""
-	accounts = frappe.db.sql_list("""select name from tabAccount
-		where is_group=0 and report_type='Balance Sheet' and company=%s""", company)
+	accounts = frappe.db.sql_list("""select
+			name from tabAccount
+		where
+			is_group=0 and report_type='Balance Sheet' and company=%s and
+			name not in(select distinct account from tabWarehouse where
+			account is not null and account != '')
+		order by name asc""", frappe.db.escape(company))
 
 	return [{"account": a, "balance": get_balance_on(a)} for a in accounts]
 
@@ -711,7 +757,7 @@ def get_outstanding(args):
 	if isinstance(args, basestring):
 		args = json.loads(args)
 
-	company_currency = get_company_currency(args.get("company"))
+	company_currency = erpnext.get_company_currency(args.get("company"))
 
 	if args.get("doctype") == "Journal Entry":
 		condition = " and party=%(party)s" if args.get("party") else ""
@@ -760,7 +806,8 @@ def get_party_account_and_balance(company, party_type, party):
 	return {
 		"account": account,
 		"balance": account_balance,
-		"party_balance": party_balance
+		"party_balance": party_balance,
+		"account_currency": frappe.db.get_value("Account", account, "account_currency")
 	}
 
 @frappe.whitelist()
@@ -769,7 +816,7 @@ def get_account_balance_and_party_type(account, date, company, debit=None, credi
 	if not frappe.has_permission("Account"):
 		frappe.msgprint(_("No Permission"), raise_exception=1)
 
-	company_currency = get_company_currency(company)
+	company_currency = erpnext.get_company_currency(company)
 	account_details = frappe.db.get_value("Account", account, ["account_type", "account_currency"], as_dict=1)
 
 	if not account_details:
@@ -787,7 +834,10 @@ def get_account_balance_and_party_type(account, date, company, debit=None, credi
 		"party_type": party_type,
 		"account_type": account_details.account_type,
 		"account_currency": account_details.account_currency or company_currency,
-		"exchange_rate": get_exchange_rate(account, account_details.account_currency,
+
+		# The date used to retreive the exchange rate here is the date passed in
+		# as an argument to this function. It is assumed to be the date on which the balance is sought
+		"exchange_rate": get_exchange_rate(date, account, account_details.account_currency,
 			company, debit=debit, credit=credit, exchange_rate=exchange_rate)
 	}
 
@@ -797,8 +847,9 @@ def get_account_balance_and_party_type(account, date, company, debit=None, credi
 
 	return grid_values
 
+# Added posting_date as one of the parameters of get_exchange_rate
 @frappe.whitelist()
-def get_exchange_rate(account, account_currency=None, company=None,
+def get_exchange_rate(posting_date, account=None, account_currency=None, company=None,
 		reference_type=None, reference_name=None, debit=None, credit=None, exchange_rate=None):
 	from erpnext.setup.utils import get_exchange_rate
 	account_details = frappe.db.get_value("Account", account,
@@ -813,20 +864,16 @@ def get_exchange_rate(account, account_currency=None, company=None,
 	if not account_currency:
 		account_currency = account_details.account_currency
 
-	company_currency = get_company_currency(company)
+	company_currency = erpnext.get_company_currency(company)
 
 	if account_currency != company_currency:
 		if reference_type in ("Sales Invoice", "Purchase Invoice") and reference_name:
 			exchange_rate = frappe.db.get_value(reference_type, reference_name, "conversion_rate")
 
-		elif account_details and account_details.account_type == "Bank" and \
-			((account_details.root_type == "Asset" and flt(credit) > 0) or
-				(account_details.root_type == "Liability" and debit)):
-			exchange_rate = get_average_exchange_rate(account)
-
-		if not exchange_rate and account_currency:
-			exchange_rate = get_exchange_rate(account_currency, company_currency)
-
+		# The date used to retreive the exchange rate here is the date passed
+		# in as an argument to this function.
+		elif (not exchange_rate or exchange_rate==1) and account_currency and posting_date:
+			exchange_rate = get_exchange_rate(account_currency, company_currency, posting_date)
 	else:
 		exchange_rate = 1
 

erpnext/accounts/doctype/journal_entry/test_journal_entry.js

@@ -0,0 +1,39 @@
+QUnit.module('Journal Entry');
+
+QUnit.test("test journal entry", function(assert) {
+	assert.expect(2);
+	let done = assert.async();
+	frappe.run_serially([
+		() => {
+			return frappe.tests.make('Journal Entry', [
+				{posting_date:frappe.datetime.add_days(frappe.datetime.nowdate(), 0)},
+				{accounts: [
+					[
+						{'account':'Debtors - '+frappe.get_abbr(frappe.defaults.get_default('Company'))},
+						{'party_type':'Customer'},
+						{'party':'Test Customer 1'},
+						{'credit_in_account_currency':1000},
+						{'is_advance':'Yes'},
+					],
+					[
+						{'account':'HDFC - '+frappe.get_abbr(frappe.defaults.get_default('Company'))},
+						{'debit_in_account_currency':1000},
+					]
+				]},
+				{cheque_no:1234},
+				{cheque_date: frappe.datetime.add_days(frappe.datetime.nowdate(), -1)},
+				{user_remark: 'Test'},
+			]);
+		},
+		() => cur_frm.save(),
+		() => {
+			// get_item_details
+			assert.ok(cur_frm.doc.total_debit==1000, "total debit correct");
+			assert.ok(cur_frm.doc.total_credit==1000, "total credit correct");
+		},
+		() => frappe.tests.click_button('Submit'),
+		() => frappe.tests.click_button('Yes'),
+		() => frappe.timeout(0.3),
+		() => done()
+	]);
+});

erpnext/accounts/doctype/journal_entry/test_journal_entry.py

@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import unittest, frappe
 from frappe.utils import flt
+from erpnext.accounts.doctype.account.test_account import get_inventory_account
 from erpnext.exceptions import InvalidAccountCurrency
 
 
@@ -83,7 +84,8 @@ class TestJournalEntry(unittest.TestCase):
 
 		jv = frappe.copy_doc(test_records[0])
 		jv.get("accounts")[0].update({
-			"account": "_Test Warehouse - _TC",
+			"account": get_inventory_account('_Test Company'),
+			"company": "_Test Company",
 			"party_type": None,
 			"party": None
 		})
@@ -172,7 +174,10 @@ class TestJournalEntry(unittest.TestCase):
 
 		jv.submit()
 
-def make_journal_entry(account1, account2, amount, cost_center=None, posting_date=None, exchange_rate=1, save=True, submit=False):
+def make_journal_entry(account1, account2, amount, cost_center=None, posting_date=None, exchange_rate=1, save=True, submit=False, project=None):
+	if not cost_center:
+		cost_center = "_Test Cost Center - _TC"
+
 	jv = frappe.new_doc("Journal Entry")
 	jv.posting_date = posting_date or "2013-02-14"
 	jv.company = "_Test Company"
@@ -182,12 +187,14 @@ def make_journal_entry(account1, account2, amount, cost_center=None, posting_dat
 		{
 			"account": account1,
 			"cost_center": cost_center,
+			"project": project,
 			"debit_in_account_currency": amount if amount > 0 else 0,
 			"credit_in_account_currency": abs(amount) if amount < 0 else 0,
 			"exchange_rate": exchange_rate
 		}, {
 			"account": account2,
 			"cost_center": cost_center,
+			"project": project,
 			"credit_in_account_currency": amount if amount > 0 else 0,
 			"debit_in_account_currency": abs(amount) if amount < 0 else 0,
 			"exchange_rate": exchange_rate

erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json

@@ -8,19 +8,24 @@
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "document_type": "Document", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 3, 
    "fieldname": "account", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -32,6 +37,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "250px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 1, 
@@ -43,13 +49,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "account_type", 
    "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": "Account Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -58,6 +67,7 @@
    "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, 
@@ -68,13 +78,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "balance", 
    "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": "Account Balance", 
    "length": 0, 
    "no_copy": 1, 
@@ -85,6 +98,7 @@
    "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, 
@@ -95,6 +109,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": ":Company", 
    "description": "If Income or Expense", 
    "fieldname": "cost_center", 
@@ -102,8 +117,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Cost Center", 
    "length": 0, 
    "no_copy": 0, 
@@ -115,6 +132,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "180px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -126,19 +144,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -149,13 +171,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "party_type", 
    "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": "Party Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -164,6 +189,7 @@
    "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, 
@@ -174,13 +200,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 3, 
    "fieldname": "party", 
    "fieldtype": "Dynamic 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": "Party", 
    "length": 0, 
    "no_copy": 0, 
@@ -189,6 +218,7 @@
    "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, 
@@ -199,13 +229,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "party_balance", 
    "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": "Party Balance", 
    "length": 0, 
    "no_copy": 0, 
@@ -215,6 +248,7 @@
    "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, 
@@ -226,6 +260,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "collapsible_depends_on": "", 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "currency_section", 
    "fieldtype": "Section Break", 
@@ -233,7 +268,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -242,6 +279,7 @@
    "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, 
@@ -252,13 +290,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "account_currency", 
    "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 Currency", 
    "length": 0, 
    "no_copy": 1, 
@@ -268,6 +309,7 @@
    "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, 
@@ -278,13 +320,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_10", 
    "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, 
@@ -292,6 +337,7 @@
    "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, 
@@ -302,13 +348,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "exchange_rate", 
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Exchange Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -317,6 +366,7 @@
    "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, 
@@ -327,13 +377,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "sec_break1", 
    "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": "Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -341,6 +394,7 @@
    "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, 
@@ -351,13 +405,16 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "debit_in_account_currency", 
    "fieldtype": "Currency", 
    "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": "Debit", 
    "length": 0, 
    "no_copy": 0, 
@@ -367,6 +424,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 1, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -377,13 +435,16 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "debit", 
    "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": "Debit in Company Currency", 
    "length": 0, 
    "no_copy": 1, 
@@ -395,6 +456,7 @@
    "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, 
@@ -405,19 +467,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break2", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -428,13 +494,16 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "credit_in_account_currency", 
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Credit", 
    "length": 0, 
    "no_copy": 0, 
@@ -444,6 +513,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 1, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -454,13 +524,16 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "credit", 
    "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": "Credit in Company Currency", 
    "length": 0, 
    "no_copy": 1, 
@@ -472,6 +545,7 @@
    "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, 
@@ -482,13 +556,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reference", 
    "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": "Reference", 
    "length": 0, 
    "no_copy": 0, 
@@ -496,6 +573,7 @@
    "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, 
@@ -506,22 +584,26 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reference_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": "Reference Type", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "\nSales Invoice\nPurchase Invoice\nJournal Entry\nSales Order\nPurchase Order\nExpense Claim\nAsset", 
+   "options": "\nSales Invoice\nPurchase Invoice\nJournal Entry\nSales Order\nPurchase Order\nExpense Claim\nAsset\nEmployee Loan", 
    "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, 
@@ -532,13 +614,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reference_name", 
    "fieldtype": "Dynamic 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": "Reference Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -548,6 +633,7 @@
    "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, 
@@ -558,13 +644,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "project", 
    "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": "Project", 
    "length": 0, 
    "no_copy": 0, 
@@ -574,6 +663,7 @@
    "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, 
@@ -584,19 +674,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -607,13 +701,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "is_advance", 
    "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": "Is Advance", 
    "length": 0, 
    "no_copy": 1, 
@@ -624,6 +721,7 @@
    "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, 
@@ -634,13 +732,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "against_account", 
    "fieldtype": "Text", 
    "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": "Against Account", 
    "length": 0, 
    "no_copy": 1, 
@@ -650,6 +751,7 @@
    "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, 
@@ -667,7 +769,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-11 03:28:01.575159", 
+ "modified": "2017-03-02 05:02:10.102039", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Journal Entry Account", 
@@ -676,6 +778,8 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_order": "DESC", 
+ "track_changes": 1, 
  "track_seen": 0
 }

erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json

@@ -3,23 +3,29 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:mode_of_payment", 
+ "beta": 0, 
  "creation": "2012-12-04 17:49:20", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "mode_of_payment", 
    "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": "Mode of Payment", 
    "length": 0, 
    "no_copy": 0, 
@@ -29,6 +35,7 @@
    "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, 
@@ -39,13 +46,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "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": 1, 
    "label": "Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -55,6 +65,7 @@
    "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, 
@@ -65,13 +76,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "accounts", 
    "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": "Accounts", 
    "length": 0, 
    "no_copy": 0, 
@@ -81,6 +95,7 @@
    "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, 
@@ -90,15 +105,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-credit-card", 
+ "icon": "fa fa-credit-card", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-04-26 11:48:17.411796", 
+ "modified": "2017-02-17 16:31:34.207683", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Mode of Payment", 
@@ -148,6 +164,8 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_order": "ASC", 
+ "track_changes": 0, 
  "track_seen": 0
 }

erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py

@@ -25,4 +25,5 @@ class ModeofPayment(Document):
 		for entry in self.accounts:
 			"""Error when Company of Ledger account doesn't match with Company Selected"""
 			if frappe.db.get_value("Account", entry.default_account, "company") != entry.company:
-				frappe.throw(_("Account does not match with Company"))
+				frappe.throw(_("Account {0} does not match with Company {1} in Mode of Account: {2}")
+					.format(entry.default_account, entry.company, self.name))

erpnext/accounts/doctype/monthly_distribution/monthly_distribution.js

@@ -2,13 +2,13 @@
 // License: GNU General Public License v3. See license.txt
 
 cur_frm.cscript.onload = function(doc,cdt,cdn){
-  if(doc.__islocal){
-    var callback1 = function(r,rt){
-      refresh_field('percentages');
-    }
+	if(doc.__islocal){
+		var callback1 = function(r,rt){
+			refresh_field('percentages');
+		}
 
-    return $c('runserverobj',args={'method':'get_months', 'docs':doc}, callback1);
-  }
+		return $c('runserverobj', {'method':'get_months', 'docs':doc}, callback1);
+	}
 }
 
 cur_frm.cscript.refresh = function(doc,cdt,cdn){

erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json

@@ -9,11 +9,14 @@
  "description": "**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.", 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Name of the Monthly Distribution", 
    "fieldname": "distribution_id", 
    "fieldtype": "Data", 
@@ -22,6 +25,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Distribution Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -31,6 +35,7 @@
    "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, 
@@ -41,6 +46,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "fiscal_year", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -48,6 +54,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Fiscal Year", 
    "length": 0, 
    "no_copy": 0, 
@@ -58,6 +65,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -68,6 +76,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "percentages", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -75,6 +84,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Monthly Distribution Percentages", 
    "length": 0, 
    "no_copy": 0, 
@@ -85,6 +95,7 @@
    "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, 
@@ -94,15 +105,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-bar-chart", 
+ "icon": "fa fa-bar-chart", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-05-16 16:35:20.349194", 
+ "modified": "2016-11-21 14:54:35.998761", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Monthly Distribution", 
@@ -119,6 +131,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -139,6 +152,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 2, 
    "print": 0, 
    "read": 1, 
@@ -150,7 +164,7 @@
    "write": 0
   }
  ], 
- "quick_entry": 1, 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 

erpnext/accounts/doctype/payment_entry/payment_entry.js

@@ -11,16 +11,9 @@ frappe.ui.form.on('Payment Entry', {
 	},
 
 	setup: function(frm) {
-		frm.get_field('references').grid.editable_fields = [
-			{fieldname: 'reference_doctype', columns: 2},
-			{fieldname: 'reference_name', columns: 2},
-			{fieldname: 'outstanding_amount', columns: 3},
-			{fieldname: 'allocated_amount', columns: 3}
-		];
-
-		var party_account_type = frm.doc.party_type=="Customer" ? "Receivable" : "Payable";
-
 		frm.set_query("paid_from", function() {
+			var party_account_type = in_list(["Customer", "Student"], frm.doc.party_type) ?
+				"Receivable" : "Payable";
 			var account_types = in_list(["Pay", "Internal Transfer"], frm.doc.payment_type) ?
 				["Bank", "Cash"] : party_account_type;
 
@@ -33,9 +26,19 @@ frappe.ui.form.on('Payment Entry', {
 			}
 		});
 
+		frm.set_query("party_type", function() {
+			return{
+				"filters": {
+					"name": ["in",["Customer","Supplier", "Employee", "Student"]],
+				}
+			}
+		});
+
 		frm.set_query("paid_to", function() {
+			var party_account_type = in_list(["Customer", "Student"], frm.doc.party_type) ?
+				"Receivable" : "Payable";
 			var account_types = in_list(["Receive", "Internal Transfer"], frm.doc.payment_type) ?
-	 			["Bank", "Cash"] : party_account_type;
+				["Bank", "Cash"] : party_account_type;
 
 			return {
 				filters: {
@@ -69,6 +72,10 @@ frappe.ui.form.on('Payment Entry', {
 				var doctypes = ["Sales Order", "Sales Invoice", "Journal Entry"];
 			} else if (frm.doc.party_type=="Supplier") {
 				var doctypes = ["Purchase Order", "Purchase Invoice", "Journal Entry"];
+			} else if (frm.doc.party_type=="Employee") {
+				var doctypes = ["Expense Claim", "Journal Entry"];
+			} else if (frm.doc.party_type=="Student") {
+				var doctypes = ["Fees"];
 			} else {
 				var doctypes = ["Journal Entry"];
 			}
@@ -77,6 +84,26 @@ frappe.ui.form.on('Payment Entry', {
 				filters: { "name": ["in", doctypes] }
 			};
 		});
+
+		frm.set_query("reference_name", "references", function(doc, cdt, cdn) {
+			child = locals[cdt][cdn];
+			filters = {"docstatus": 1, "company": doc.company};
+			party_type_doctypes = ['Sales Invoice', 'Sales Order', 'Purchase Invoice', 
+				'Purchase Order', 'Expense Claim', 'Fees'];
+
+			if (in_list(party_type_doctypes, child.reference_doctype)) {
+				filters[doc.party_type.toLowerCase()] = doc.party;
+			}
+
+			if(child.reference_doctype == "Expense Claim") {
+				filters["status"] = "Approved";
+				filters["is_paid"] = 0;
+			}
+
+			return {
+				filters: filters
+			};
+		});
 	},
 
 	refresh: function(frm) {
@@ -86,8 +113,13 @@ frappe.ui.form.on('Payment Entry', {
 		frm.events.show_general_ledger(frm);
 	},
 
+	company: function(frm) {
+		frm.events.hide_unhide_fields(frm);
+		frm.events.set_dynamic_labels(frm);
+	},
+
 	hide_unhide_fields: function(frm) {
-		var company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
+		var company_currency = frm.doc.company? frappe.get_doc(":Company", frm.doc.company).default_currency: "";
 
 		frm.toggle_display("source_exchange_rate",
 			(frm.doc.paid_amount && frm.doc.paid_from_account_currency != company_currency));
@@ -125,52 +157,28 @@ frappe.ui.form.on('Payment Entry', {
 	},
 
 	set_dynamic_labels: function(frm) {
-		var company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
+		var company_currency = frm.doc.company? frappe.get_doc(":Company", frm.doc.company).default_currency: "";
 
-		var field_label_map = {};
-		var grid_field_label_map = {};
-
-		var setup_field_label_map = function(fields_list, currency, parentfield) {
-			var doctype = parentfield ? frm.fields_dict[parentfield].grid.doctype : frm.doc.doctype;
-			$.each(fields_list, function(i, fname) {
-				var docfield = frappe.meta.docfield_map[doctype][fname];
-				if(docfield) {
-					var label = __(docfield.label || "").replace(/\([^\)]*\)/g, "");
-					if(parentfield) {
-						grid_field_label_map[doctype + "-" + fname] =
-							label.trim() + " (" + __(currency) + ")";
-					} else {
-						field_label_map[fname] = label.trim() + " (" + currency + ")";
-					}
-				}
-			});
-		}
-
-		setup_field_label_map(["base_paid_amount", "base_received_amount", "base_total_allocated_amount",
+		frm.set_currency_labels(["base_paid_amount", "base_received_amount", "base_total_allocated_amount",
 			"difference_amount"], company_currency);
 
-		setup_field_label_map(["paid_amount"], frm.doc.paid_from_account_currency);
-		setup_field_label_map(["received_amount"], frm.doc.paid_to_account_currency);
+		frm.set_currency_labels(["paid_amount"], frm.doc.paid_from_account_currency);
+		frm.set_currency_labels(["received_amount"], frm.doc.paid_to_account_currency);
 
 		var party_account_currency = frm.doc.payment_type=="Receive" ?
 			frm.doc.paid_from_account_currency : frm.doc.paid_to_account_currency;
 
-		setup_field_label_map(["total_allocated_amount", "unallocated_amount"], party_account_currency);
+		frm.set_currency_labels(["total_allocated_amount", "unallocated_amount"], party_account_currency);
 
-		$.each(field_label_map, function(fname, label) {
-			me.frm.fields_dict[fname].set_label(label);
-		});
+		var currency_field = (frm.doc.payment_type=="Receive") ? "paid_from_account_currency" : "paid_to_account_currency"
+		frm.set_df_property("total_allocated_amount", "options", currency_field);
+		frm.set_df_property("unallocated_amount", "options", currency_field);
+		frm.set_df_property("party_balance", "options", currency_field);
 
-		setup_field_label_map(["total_amount", "outstanding_amount", "allocated_amount"],
+		frm.set_currency_labels(["total_amount", "outstanding_amount", "allocated_amount"],
 			party_account_currency, "references");
 
-		setup_field_label_map(["amount"], company_currency, "deductions");
-
-		$.each(grid_field_label_map, function(fname, label) {
-			fname = fname.split("-");
-			var df = frappe.meta.get_docfield(fname[0], fname[1], me.frm.doc.name);
-			if(df) df.label = label;
-		});
+		frm.set_currency_labels(["amount"], company_currency, "deductions");
 
 		cur_frm.set_df_property("source_exchange_rate", "description",
 			("1 " + frm.doc.paid_from_account_currency + " = [?] " + company_currency));
@@ -192,7 +200,7 @@ frappe.ui.form.on('Payment Entry', {
 					group_by_voucher: 0
 				};
 				frappe.set_route("query-report", "General Ledger");
-			}, "icon-table");
+			}, "fa fa-table");
 		}
 	},
 
@@ -200,16 +208,16 @@ frappe.ui.form.on('Payment Entry', {
 		if(frm.doc.payment_type == "Internal Transfer") {
 			$.each(["party", "party_balance", "paid_from", "paid_to",
 				"references", "total_allocated_amount"], function(i, field) {
-					frm.set_value(field, null);
-			})
+				frm.set_value(field, null);
+			});
 		} else {
-			if(!frm.doc.party)
-				frm.set_value("party_type", frm.doc.payment_type=="Receive" ? "Customer" : "Supplier");
-			else
-				frm.events.party(frm);
+			if(frm.doc.party) {
+				frm.events.party(frm);	
+			}
 
-			if(frm.doc.mode_of_payment)
+			if(frm.doc.mode_of_payment) {
 				frm.events.mode_of_payment(frm);
+			}
 		}
 	},
 
@@ -218,9 +226,10 @@ frappe.ui.form.on('Payment Entry', {
 			$.each(["party", "party_balance", "paid_from", "paid_to",
 				"paid_from_account_currency", "paid_from_account_balance",
 				"paid_to_account_currency", "paid_to_account_balance",
-				"references", "total_allocated_amount"], function(i, field) {
+				"references", "total_allocated_amount"],
+				function(i, field) {
 					frm.set_value(field, null);
-			})
+				})
 		}
 	},
 
@@ -243,6 +252,7 @@ frappe.ui.form.on('Payment Entry', {
 					date: frm.doc.posting_date
 				},
 				callback: function(r, rt) {
+					console.log(r, rt);
 					if(r.message) {
 						if(frm.doc.payment_type == "Receive") {
 							frm.set_value("paid_from", r.message.party_account);
@@ -294,37 +304,39 @@ frappe.ui.form.on('Payment Entry', {
 
 	set_account_currency_and_balance: function(frm, account, currency_field,
 			balance_field, callback_function) {
-		frappe.call({
-			method: "erpnext.accounts.doctype.payment_entry.payment_entry.get_account_details",
-			args: {
-				"account": account,
-				"date": frm.doc.posting_date
-			},
-			callback: function(r, rt) {
-				if(r.message) {
-					frm.set_value(currency_field, r.message['account_currency']);
-					frm.set_value(balance_field, r.message['account_balance']);
+		if (frm.doc.posting_date && account) {
+			frappe.call({
+				method: "erpnext.accounts.doctype.payment_entry.payment_entry.get_account_details",
+				args: {
+					"account": account,
+					"date": frm.doc.posting_date
+				},
+				callback: function(r, rt) {
+					if(r.message) {
+						frm.set_value(currency_field, r.message['account_currency']);
+						frm.set_value(balance_field, r.message['account_balance']);
 
-					if(frm.doc.payment_type=="Receive" && currency_field=="paid_to_account_currency") {
-						frm.toggle_reqd(["reference_no", "reference_date"],
-							(r.message['account_type'] == "Bank" ? 1 : 0));
-						if(!frm.doc.received_amount && frm.doc.paid_amount)
-							frm.events.paid_amount(frm);
-					} else if(frm.doc.payment_type=="Pay" && currency_field=="paid_from_account_currency") {
-						frm.toggle_reqd(["reference_no", "reference_date"],
-							(r.message['account_type'] == "Bank" ? 1 : 0));
+						if(frm.doc.payment_type=="Receive" && currency_field=="paid_to_account_currency") {
+							frm.toggle_reqd(["reference_no", "reference_date"],
+								(r.message['account_type'] == "Bank" ? 1 : 0));
+							if(!frm.doc.received_amount && frm.doc.paid_amount)
+								frm.events.paid_amount(frm);
+						} else if(frm.doc.payment_type=="Pay" && currency_field=="paid_from_account_currency") {
+							frm.toggle_reqd(["reference_no", "reference_date"],
+								(r.message['account_type'] == "Bank" ? 1 : 0));
 
-						if(!frm.doc.paid_amount && frm.doc.received_amount)
-							frm.events.received_amount(frm);
+							if(!frm.doc.paid_amount && frm.doc.received_amount)
+								frm.events.received_amount(frm);
+						}
+
+						if(callback_function) callback_function(frm);
+
+						frm.events.hide_unhide_fields(frm);
+						frm.events.set_dynamic_labels(frm);
 					}
-
-					if(callback_function) callback_function(frm);
-
-					frm.events.hide_unhide_fields(frm);
-					frm.events.set_dynamic_labels(frm);
 				}
-			}
-		});
+			});			
+		}
 	},
 
 	paid_from_account_currency: function(frm) {
@@ -335,10 +347,13 @@ frappe.ui.form.on('Payment Entry', {
 			frm.set_value("source_exchange_rate", 1);
 		} else if (frm.doc.paid_from){
 			if (in_list(["Internal Transfer", "Pay"], frm.doc.payment_type)) {
+				var company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
 				frappe.call({
-					method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_average_exchange_rate",
+					method: "erpnext.setup.utils.get_exchange_rate",
 					args: {
-						account: frm.doc.paid_from
+						from_currency: frm.doc.paid_from_account_currency,
+						to_currency: company_currency,
+						transaction_date: frm.doc.posting_date
 					},
 					callback: function(r, rt) {
 						frm.set_value("source_exchange_rate", r.message);
@@ -363,6 +378,7 @@ frappe.ui.form.on('Payment Entry', {
 		frappe.call({
 			method: "erpnext.setup.utils.get_exchange_rate",
 			args: {
+				transaction_date: frm.doc.posting_date,
 				from_currency: from_currency,
 				to_currency: to_currency
 			},
@@ -371,6 +387,10 @@ frappe.ui.form.on('Payment Entry', {
 			}
 		})
 	},
+	
+	posting_date: function(frm) {
+		frm.events.paid_from_account_currency(frm);
+	},
 
 	source_exchange_rate: function(frm) {
 		if (frm.doc.paid_amount) {
@@ -383,6 +403,9 @@ frappe.ui.form.on('Payment Entry', {
 			
 			frm.events.set_difference_amount(frm);
 		}
+
+		// Make read only if Accounts Settings doesn't allow stale rates
+		frm.set_df_property("source_exchange_rate", "read_only", erpnext.stale_rate_allowed());
 	},
 
 	target_exchange_rate: function(frm) {
@@ -401,6 +424,9 @@ frappe.ui.form.on('Payment Entry', {
 			frm.events.set_difference_amount(frm);
 		}
 		frm.set_paid_amount_based_on_received_amount = false;
+
+		// Make read only if Accounts Settings doesn't allow stale rates
+		frm.set_df_property("target_exchange_rate", "read_only", erpnext.stale_rate_allowed());
 	},
 
 	paid_amount: function(frm) {
@@ -413,7 +439,10 @@ frappe.ui.form.on('Payment Entry', {
 
 		if(!frm.doc.paid_amount && frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency) {
 			frm.set_value("paid_amount", frm.doc.received_amount);
-			frm.set_value("source_exchange_rate", frm.doc.target_exchange_rate);
+
+			if(frm.doc.target_exchange_rate) {
+				frm.set_value("source_exchange_rate", frm.doc.target_exchange_rate);
+			}
 			frm.set_value("base_paid_amount", frm.doc.base_received_amount);
 		}
 
@@ -433,7 +462,10 @@ frappe.ui.form.on('Payment Entry', {
 				(frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency)) {
 			
 			frm.set_value("received_amount", frm.doc.paid_amount);
-			frm.set_value("target_exchange_rate", frm.doc.source_exchange_rate);
+
+			if(frm.doc.source_exchange_rate) {
+				frm.set_value("target_exchange_rate", frm.doc.source_exchange_rate);
+			}
 			frm.set_value("base_received_amount", frm.doc.base_paid_amount);
 		}
 		
@@ -455,6 +487,7 @@ frappe.ui.form.on('Payment Entry', {
 			method: 'erpnext.accounts.doctype.payment_entry.payment_entry.get_outstanding_reference_documents',
 			args: {
 				args: {
+					"posting_date": frm.doc.posting_date,
 					"company": frm.doc.company,
 					"party_type": frm.doc.party_type,
 					"payment_type": frm.doc.payment_type,
@@ -471,9 +504,12 @@ frappe.ui.form.on('Payment Entry', {
 						var c = frm.add_child("references");
 						c.reference_doctype = d.voucher_type;
 						c.reference_name = d.voucher_no;
+						c.due_date = d.due_date
 						c.total_amount = d.invoice_amount;
 						c.outstanding_amount = d.outstanding_amount;
-						if(!in_list(["Sales Order", "Purchase Order"], d.voucher_type)) {
+						c.bill_no = d.bill_no;
+
+						if(!in_list(["Sales Order", "Purchase Order", "Expense Claim"], d.voucher_type)) {
 							if(flt(d.outstanding_amount) > 0)
 								total_positive_outstanding += flt(d.outstanding_amount);
 							else
@@ -488,18 +524,23 @@ frappe.ui.form.on('Payment Entry', {
 						} else {
 							c.exchange_rate = 1;
 						}
-						if (in_list(['Sales Invoice', 'Purchase Invoice'], d.reference_doctype)){
+						if (in_list(['Sales Invoice', 'Purchase Invoice', "Expense Claim"], d.reference_doctype)){
 							c.due_date = d.due_date;
 						}
 					});
 
-					if((frm.doc.payment_type=="Receive" && frm.doc.party_type=="Customer") ||
-						(frm.doc.payment_type=="Pay" && frm.doc.party_type=="Supplier")) {
-							if(total_positive_outstanding > total_negative_outstanding)
-								frm.set_value("paid_amount",
-									total_positive_outstanding - total_negative_outstanding);
-					} else if (total_negative_outstanding &&
-							(total_positive_outstanding < total_negative_outstanding)) {
+					if(
+						(frm.doc.payment_type=="Receive" && frm.doc.party_type=="Customer") ||
+						(frm.doc.payment_type=="Pay" && frm.doc.party_type=="Supplier")  ||
+						(frm.doc.payment_type=="Pay" && frm.doc.party_type=="Employee")
+					) {
+						if(total_positive_outstanding > total_negative_outstanding)
+							frm.set_value("paid_amount",
+								total_positive_outstanding - total_negative_outstanding);
+					} else if (
+						total_negative_outstanding &&
+						total_positive_outstanding < total_negative_outstanding
+					) {
 						frm.set_value("received_amount",
 							total_negative_outstanding - total_positive_outstanding);
 					}
@@ -511,6 +552,18 @@ frappe.ui.form.on('Payment Entry', {
 		});
 	},
 
+	allocate_payment_amount: function(frm) {
+		if(frm.doc.payment_type == 'Internal Transfer'){
+			return
+		}
+
+		if(frm.doc.references.length == 0){
+			frm.events.get_outstanding_documents(frm);
+		}
+
+		frm.events.allocate_party_amount_against_ref_docs(frm, frm.doc.received_amount);
+	},
+
 	allocate_party_amount_against_ref_docs: function(frm, paid_amount) {
 		var total_positive_outstanding_including_order = 0;
 		var total_negative_outstanding = 0;
@@ -523,8 +576,9 @@ frappe.ui.form.on('Payment Entry', {
 		})
 
 		var allocated_negative_outstanding = 0;
-		if((frm.doc.payment_type=="Receive" && frm.doc.party_type=="Customer") ||
-				(frm.doc.payment_type=="Pay" && frm.doc.party_type=="Supplier")) {
+		if ((frm.doc.payment_type=="Receive" && frm.doc.party_type=="Customer") ||
+				(frm.doc.payment_type=="Pay" && frm.doc.party_type=="Supplier") ||
+				(frm.doc.payment_type=="Pay" && frm.doc.party_type=="Employee")) {
 			if(total_positive_outstanding_including_order > paid_amount) {
 				var remaining_outstanding = total_positive_outstanding_including_order - paid_amount;
 				allocated_negative_outstanding = total_negative_outstanding < remaining_outstanding ?
@@ -532,7 +586,7 @@ frappe.ui.form.on('Payment Entry', {
 			}
 
 			var allocated_positive_outstanding =  paid_amount + allocated_negative_outstanding;
-		} else {
+		} else if (in_list(["Customer", "Supplier"], frm.doc.party_type)) {
 			if(paid_amount > total_negative_outstanding) {
 				if(total_negative_outstanding == 0) {
 					frappe.msgprint(__("Cannot {0} {1} {2} without any negative outstanding invoice",
@@ -552,28 +606,33 @@ frappe.ui.form.on('Payment Entry', {
 		}
 
 		$.each(frm.doc.references || [], function(i, row) {
-			row.allocated_amount = 0
-
-			if(row.outstanding_amount > 0 && allocated_positive_outstanding > 0) {
-				if(row.outstanding_amount >= allocated_positive_outstanding)
+			row.allocated_amount = 0 //If allocate payment amount checkbox is unchecked, set zero to allocate amount
+			if(frm.doc.allocate_payment_amount){
+				if(row.outstanding_amount > 0 && allocated_positive_outstanding > 0) {
+					if(row.outstanding_amount >= allocated_positive_outstanding) {
 						row.allocated_amount = allocated_positive_outstanding;
-				else row.allocated_amount = row.outstanding_amount;
+					} else {
+						row.allocated_amount = row.outstanding_amount;
+					}
 
-				allocated_positive_outstanding -= flt(row.allocated_amount);
-			} else if (row.outstanding_amount < 0 && allocated_negative_outstanding) {
-				if(Math.abs(row.outstanding_amount) >= allocated_negative_outstanding)
-					row.allocated_amount = -1*allocated_negative_outstanding;
-				else row.allocated_amount = row.outstanding_amount;
+					allocated_positive_outstanding -= flt(row.allocated_amount);
+				} else if (row.outstanding_amount < 0 && allocated_negative_outstanding) {
+					if(Math.abs(row.outstanding_amount) >= allocated_negative_outstanding)
+						row.allocated_amount = -1*allocated_negative_outstanding;
+					else row.allocated_amount = row.outstanding_amount;
 
-				allocated_negative_outstanding -= Math.abs(flt(row.allocated_amount));
+					allocated_negative_outstanding -= Math.abs(flt(row.allocated_amount));
+				}
 			}
 		})
+
 		frm.refresh_fields()
 		frm.events.set_total_allocated_amount(frm);
 	},
 
 	set_total_allocated_amount: function(frm) {
-		var total_allocated_amount = base_total_allocated_amount = 0.0;
+		var total_allocated_amount = 0.0;
+		var base_total_allocated_amount = 0.0;
 		$.each(frm.doc.references || [], function(i, row) {
 			if (row.allocated_amount) {
 				total_allocated_amount += flt(row.allocated_amount);
@@ -592,7 +651,7 @@ frappe.ui.form.on('Payment Entry', {
 		if(frm.doc.party) {
 			var party_amount = frm.doc.payment_type=="Receive" ?
 				frm.doc.paid_amount : frm.doc.received_amount;
-				
+
 			var total_deductions = frappe.utils.sum($.map(frm.doc.deductions || [],
 				function(d) { return flt(d.amount) }));
 
@@ -620,11 +679,7 @@ frappe.ui.form.on('Payment Entry', {
 			difference_amount = flt(frm.doc.base_paid_amount) - flt(frm.doc.base_received_amount);
 		}
 
-		$.each(frm.doc.deductions || [], function(i, d) {
-			if(d.amount) difference_amount -= flt(d.amount);
-		})
-
-		frm.set_value("difference_amount", difference_amount);
+		frm.set_value("difference_amount", difference_amount - total_deductions);
 
 		frm.events.hide_unhide_fields(frm);
 	},
@@ -645,19 +700,29 @@ frappe.ui.form.on('Payment Entry', {
 				return;
 			}
 
-			if(frm.doc.party_type=="Customer"
-				&& !in_list(["Sales Order", "Sales Invoice", "Journal Entry"], row.reference_doctype)) {
-					frappe.model.set_value(row.doctype, row.name, "reference_doctype", null);
-					frappe.msgprint(__("Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry", [row.idx]));
-					return false;
-				}
+			if(frm.doc.party_type=="Customer" &&
+				!in_list(["Sales Order", "Sales Invoice", "Journal Entry"], row.reference_doctype)
+			) {
+				frappe.model.set_value(row.doctype, row.name, "reference_doctype", null);
+				frappe.msgprint(__("Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry", [row.idx]));
+				return false;
+			}
 
-			if(frm.doc.party_type=="Supplier" && !in_list(["Purchase Order",
-				"Purchase Invoice", "Journal Entry"], row.reference_doctype)) {
-					frappe.model.set_value(row.doctype, row.name, "against_voucher_type", null);
-					frappe.msgprint(__("Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry", [row.idx]));
-					return false;
-				}
+			if(frm.doc.party_type=="Supplier" &&
+				!in_list(["Purchase Order", "Purchase Invoice", "Journal Entry"], row.reference_doctype)
+			) {
+				frappe.model.set_value(row.doctype, row.name, "against_voucher_type", null);
+				frappe.msgprint(__("Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry", [row.idx]));
+				return false;
+			}
+			
+			if(frm.doc.party_type=="Employee" &&
+				!in_list(["Expense Claim", "Journal Entry"], row.reference_doctype)
+			) {
+				frappe.model.set_value(row.doctype, row.name, "against_voucher_type", null);
+				frappe.msgprint(__("Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry", [row.idx]));
+				return false;
+			}
 		}
 
 		if (row) {
@@ -751,4 +816,4 @@ frappe.ui.form.on('Payment Entry Deduction', {
 	deductions_remove: function(frm) {
 		frm.events.set_difference_amount(frm);
 	}
-})
+})

erpnext/accounts/doctype/payment_entry/payment_entry.py

@@ -12,27 +12,27 @@ from erpnext.accounts.doctype.journal_entry.journal_entry \
 	import get_average_exchange_rate, get_default_bank_cash_account
 from erpnext.setup.utils import get_exchange_rate
 from erpnext.accounts.general_ledger import make_gl_entries
-
+from erpnext.hr.doctype.expense_claim.expense_claim import update_reimbursed_amount
 from erpnext.controllers.accounts_controller import AccountsController
 
 class InvalidPaymentEntry(ValidationError): pass
 
 class PaymentEntry(AccountsController):
-	def setup_party_account_field(self):		
+	def setup_party_account_field(self):
 		self.party_account_field = None
 		self.party_account = None
 		self.party_account_currency = None
-		
+
 		if self.payment_type == "Receive":
 			self.party_account_field = "paid_from"
 			self.party_account = self.paid_from
 			self.party_account_currency = self.paid_from_account_currency
-			
+
 		elif self.payment_type == "Pay":
 			self.party_account_field = "paid_to"
 			self.party_account = self.paid_to
 			self.party_account_currency = self.paid_to_account_currency
-							
+
 	def validate(self):
 		self.setup_party_account_field()
 		self.set_missing_values()
@@ -48,128 +48,156 @@ class PaymentEntry(AccountsController):
 		self.validate_transaction_reference()
 		self.set_title()
 		self.set_remarks()
-		
+		self.validate_duplicate_entry()
+		self.validate_allocated_amount()
+
 	def on_submit(self):
 		self.setup_party_account_field()
 		if self.difference_amount:
 			frappe.throw(_("Difference Amount must be zero"))
 		self.make_gl_entries()
 		self.update_advance_paid()
-		
+		self.update_expense_claim()
+
 	def on_cancel(self):
 		self.setup_party_account_field()
 		self.make_gl_entries(cancel=1)
 		self.update_advance_paid()
-							
+		self.update_expense_claim()
+		self.delink_advance_entry_references()
+
+	def validate_duplicate_entry(self):
+		reference_names = []
+		for d in self.get("references"):
+			if (d.reference_doctype, d.reference_name) in reference_names:
+				frappe.throw(_("Row #{0}: Duplicate entry in References {1} {2}").format(d.idx, d.reference_doctype, d.reference_name))
+			reference_names.append((d.reference_doctype, d.reference_name))
+
+
+	def validate_allocated_amount(self):
+		for d in self.get("references"):
+			if (flt(d.allocated_amount))> 0:
+				if flt(d.allocated_amount) > flt(d.outstanding_amount):
+					frappe.throw(_("Row #{0}: Allocated Amount cannot be greater than outstanding amount.").format(d.idx))
+
+
+	def delink_advance_entry_references(self):
+		for reference in self.references:
+			if reference.reference_doctype in ("Sales Invoice", "Purchase Invoice"):
+				doc = frappe.get_doc(reference.reference_doctype, reference.reference_name)
+				doc.delink_advance_entries(self.name)
+
 	def set_missing_values(self):
 		if self.payment_type == "Internal Transfer":
-			for field in ("party", "party_balance", "total_allocated_amount", 
+			for field in ("party", "party_balance", "total_allocated_amount",
 				"base_total_allocated_amount", "unallocated_amount"):
 					self.set(field, None)
 			self.references = []
 		else:
 			if not self.party_type:
 				frappe.throw(_("Party Type is mandatory"))
-				
+
 			if not self.party:
 				frappe.throw(_("Party is mandatory"))
-				
-			self.party_name = frappe.db.get_value(self.party_type, self.party, 
-				self.party_type.lower() + "_name")
-		
+
+			_party_name = "title" if self.party_type == "Student" else self.party_type.lower() + "_name"
+			self.party_name = frappe.db.get_value(self.party_type, self.party, _party_name)
+
 		if self.party:
 			if not self.party_balance:
 				self.party_balance = get_balance_on(party_type=self.party_type,
 					party=self.party, date=self.posting_date, company=self.company)
-			
+
 			if not self.party_account:
 				party_account = get_party_account(self.party_type, self.party, self.company)
 				self.set(self.party_account_field, party_account)
 				self.party_account = party_account
-				
+
 		if self.paid_from and not (self.paid_from_account_currency or self.paid_from_account_balance):
 			acc = get_account_details(self.paid_from, self.posting_date)
 			self.paid_from_account_currency = acc.account_currency
 			self.paid_from_account_balance = acc.account_balance
-				
+
 		if self.paid_to and not (self.paid_to_account_currency or self.paid_to_account_balance):
 			acc = get_account_details(self.paid_to, self.posting_date)
 			self.paid_to_account_currency = acc.account_currency
 			self.paid_to_account_balance = acc.account_balance
-			
+
 		self.party_account_currency = self.paid_from_account_currency \
 			if self.payment_type=="Receive" else self.paid_to_account_currency
-			
+
 		self.set_missing_ref_details()
-			
-	
+
+
 	def set_missing_ref_details(self):
 		for d in self.get("references"):
 			if d.allocated_amount:
-				ref_details = get_reference_details(d.reference_doctype, 
+				ref_details = get_reference_details(d.reference_doctype,
 					d.reference_name, self.party_account_currency)
-					
+
 				for field, value in ref_details.items():
 					if not d.get(field):
 						d.set(field, value)
-						
+
 	def validate_payment_type(self):
 		if self.payment_type not in ("Receive", "Pay", "Internal Transfer"):
 			frappe.throw(_("Payment Type must be one of Receive, Pay and Internal Transfer"))
-	
+
 	def validate_party_details(self):
 		if self.party:
 			if not frappe.db.exists(self.party_type, self.party):
 				frappe.throw(_("Invalid {0}: {1}").format(self.party_type, self.party))
-			
+
 			if self.party_account:
-				party_account_type = "Receivable" if self.party_type=="Customer" else "Payable"
+				party_account_type = "Receivable" if self.party_type in ("Customer", "Student") else "Payable"
 				self.validate_account_type(self.party_account, [party_account_type])
-					
+
 	def validate_bank_accounts(self):
 		if self.payment_type in ("Pay", "Internal Transfer"):
 			self.validate_account_type(self.paid_from, ["Bank", "Cash"])
-			
+
 		if self.payment_type in ("Receive", "Internal Transfer"):
 			self.validate_account_type(self.paid_to, ["Bank", "Cash"])
-			
+
 	def validate_account_type(self, account, account_types):
 		account_type = frappe.db.get_value("Account", account, "account_type")
 		if account_type not in account_types:
 			frappe.throw(_("Account Type for {0} must be {1}").format(account, comma_or(account_types)))
-				
+
 	def set_exchange_rate(self):
 		if self.paid_from and not self.source_exchange_rate:
 			if self.paid_from_account_currency == self.company_currency:
 				self.source_exchange_rate = 1
-			elif self.payment_type in ("Pay", "Internal Transfer"):
-				self.source_exchange_rate = get_average_exchange_rate(self.paid_from)
 			else:
-				self.source_exchange_rate = get_exchange_rate(self.paid_from_account_currency, 
-					self.company_currency)
-		
+				self.source_exchange_rate = get_exchange_rate(self.paid_from_account_currency,
+					self.company_currency, self.posting_date)
+
 		if self.paid_to and not self.target_exchange_rate:
-			self.target_exchange_rate = get_exchange_rate(self.paid_to_account_currency, 
-				self.company_currency)
-				
+			self.target_exchange_rate = get_exchange_rate(self.paid_to_account_currency,
+				self.company_currency, self.posting_date)
+
 	def validate_mandatory(self):
 		for field in ("paid_amount", "received_amount", "source_exchange_rate", "target_exchange_rate"):
 			if not self.get(field):
 				frappe.throw(_("{0} is mandatory").format(self.meta.get_label(field)))
-				
+
 	def validate_reference_documents(self):
-		if self.party_type == "Customer":
+		if self.party_type == "Student":
+			valid_reference_doctypes = ("Fees")
+		elif self.party_type == "Customer":
 			valid_reference_doctypes = ("Sales Order", "Sales Invoice", "Journal Entry")
-		else:
+		elif self.party_type == "Supplier":
 			valid_reference_doctypes = ("Purchase Order", "Purchase Invoice", "Journal Entry")
-			
+		elif self.party_type == "Employee":
+			valid_reference_doctypes = ("Expense Claim", "Journal Entry")
+
 		for d in self.get("references"):
 			if not d.allocated_amount:
 				continue
 			if d.reference_doctype not in valid_reference_doctypes:
 				frappe.throw(_("Reference Doctype must be one of {0}")
 					.format(comma_or(valid_reference_doctypes)))
-				
+
 			elif d.reference_name:
 				if not frappe.db.exists(d.reference_doctype, d.reference_name):
 					frappe.throw(_("{0} {1} does not exist").format(d.reference_doctype, d.reference_name))
@@ -182,21 +210,28 @@ class PaymentEntry(AccountsController):
 								.format(d.reference_doctype, d.reference_name, self.party_type, self.party))
 					else:
 						self.validate_journal_entry()
-								
-					if d.reference_doctype in ("Sales Invoice", "Purchase Invoice"):
-						ref_party_account = ref_doc.debit_to \
-							if self.party_type=="Customer" else ref_doc.credit_to
+
+					if d.reference_doctype in ("Sales Invoice", "Purchase Invoice", "Expense Claim", "Fees"):
+						if self.party_type == "Customer":
+							ref_party_account = ref_doc.debit_to
+						elif self.party_type == "Student":
+							ref_party_account = ref_doc.receivable_account
+						elif self.party_type=="Supplier":
+							ref_party_account = ref_doc.credit_to
+						elif self.party_type=="Employee":
+							ref_party_account = ref_doc.payable_account
+
 						if ref_party_account != self.party_account:
-							frappe.throw(_("{0} {1} does not associated with Party Account {2}")
-								.format(d.reference_doctype, d.reference_name, self.party_account))
-						
+								frappe.throw(_("{0} {1} is associated with {2}, but Party Account is {3}")
+									.format(d.reference_doctype, d.reference_name, ref_party_account, self.party_account))
+
 					if ref_doc.docstatus != 1:
 						frappe.throw(_("{0} {1} must be submitted")
 							.format(d.reference_doctype, d.reference_name))
-							
+
 	def validate_journal_entry(self):
 		for d in self.get("references"):
-			if d.allocated_amount and d.reference_doctype == "Journal Entry":				
+			if d.allocated_amount and d.reference_doctype == "Journal Entry":
 				je_accounts = frappe.db.sql("""select debit, credit from `tabJournal Entry Account`
 					where account = %s and party=%s and docstatus = 1 and parent = %s
 					and (reference_type is null or reference_type in ("", "Sales Order", "Purchase Order"))
@@ -214,7 +249,7 @@ class PaymentEntry(AccountsController):
 					if not valid:
 						frappe.throw(_("Against Journal Entry {0} does not have any unmatched {1} entry")
 							.format(d.reference_name, dr_or_cr))
-							
+
 	def set_amounts(self):
 		self.set_amounts_in_company_currency()
 		self.set_total_allocated_amount()
@@ -224,111 +259,110 @@ class PaymentEntry(AccountsController):
 	def set_amounts_in_company_currency(self):
 		self.base_paid_amount, self.base_received_amount, self.difference_amount = 0, 0, 0
 		if self.paid_amount:
-			self.base_paid_amount = flt(flt(self.paid_amount) * flt(self.source_exchange_rate), 
+			self.base_paid_amount = flt(flt(self.paid_amount) * flt(self.source_exchange_rate),
 				self.precision("base_paid_amount"))
-				
+
 		if self.received_amount:
-			self.base_received_amount = flt(flt(self.received_amount) * flt(self.target_exchange_rate), 
+			self.base_received_amount = flt(flt(self.received_amount) * flt(self.target_exchange_rate),
 				self.precision("base_received_amount"))
-				
+
 	def set_total_allocated_amount(self):
 		if self.payment_type == "Internal Transfer":
 			return
-			
+
 		total_allocated_amount, base_total_allocated_amount = 0, 0
 		for d in self.get("references"):
-			if d.allocated_amount:				
+			if d.allocated_amount:
 				total_allocated_amount += flt(d.allocated_amount)
-				base_total_allocated_amount += flt(flt(d.allocated_amount) * flt(d.exchange_rate), 
+				base_total_allocated_amount += flt(flt(d.allocated_amount) * flt(d.exchange_rate),
 					self.precision("base_paid_amount"))
-					
+
 		self.total_allocated_amount = abs(total_allocated_amount)
 		self.base_total_allocated_amount = abs(base_total_allocated_amount)
-	
+
 	def set_unallocated_amount(self):
 		self.unallocated_amount = 0;
 		if self.party:
 			party_amount = self.paid_amount if self.payment_type=="Receive" else self.received_amount
-			
+
 			total_deductions = sum([flt(d.amount) for d in self.get("deductions")])
-			
+
 			if self.total_allocated_amount < party_amount:
 				if self.payment_type == "Receive":
 					self.unallocated_amount = party_amount - (self.total_allocated_amount - total_deductions)
 				else:
 					self.unallocated_amount = party_amount - (self.total_allocated_amount + total_deductions)
-				
+
 	def set_difference_amount(self):
-		base_unallocated_amount = flt(self.unallocated_amount) * (flt(self.source_exchange_rate) 
+		base_unallocated_amount = flt(self.unallocated_amount) * (flt(self.source_exchange_rate)
 			if self.payment_type=="Receive" else flt(self.target_exchange_rate))
-			
+
 		base_party_amount = flt(self.base_total_allocated_amount) + flt(base_unallocated_amount)
-		
+
 		if self.payment_type == "Receive":
 			self.difference_amount = base_party_amount - self.base_received_amount
 		elif self.payment_type == "Pay":
 			self.difference_amount = self.base_paid_amount - base_party_amount
 		else:
 			self.difference_amount = self.base_paid_amount - flt(self.base_received_amount)
-			
-		for d in self.get("deductions"):
-			if d.amount:
-				self.difference_amount -= flt(d.amount)
-				
-		self.difference_amount = flt(self.difference_amount, self.precision("difference_amount"))
-				
+
+		total_deductions = sum([flt(d.amount) for d in self.get("deductions")])
+
+		self.difference_amount = flt(self.difference_amount - total_deductions,
+			self.precision("difference_amount"))
+
 	def clear_unallocated_reference_document_rows(self):
 		self.set("references", self.get("references", {"allocated_amount": ["not in", [0, None, ""]]}))
 
-		frappe.db.sql("""delete from `tabPayment Entry Reference` 
+		frappe.db.sql("""delete from `tabPayment Entry Reference`
 			where parent = %s and allocated_amount = 0""", self.name)
-			
+
 	def validate_payment_against_negative_invoice(self):
-		if ((self.payment_type=="Pay" and self.party_type=="Customer") 
+		if ((self.payment_type=="Pay" and self.party_type=="Customer")
 				or (self.payment_type=="Receive" and self.party_type=="Supplier")):
-				
-			total_negative_outstanding = sum([abs(flt(d.outstanding_amount)) 
+
+			total_negative_outstanding = sum([abs(flt(d.outstanding_amount))
 				for d in self.get("references") if flt(d.outstanding_amount) < 0])
-			
+
 			party_amount = self.paid_amount if self.payment_type=="Receive" else self.received_amount
 
 			if not total_negative_outstanding:
 				frappe.throw(_("Cannot {0} {1} {2} without any negative outstanding invoice")
-					.format(self.payment_type, ("to" if self.party_type=="Customer" else "from"), 
+					.format(self.payment_type, ("to" if self.party_type=="Customer" else "from"),
 						self.party_type), InvalidPaymentEntry)
-					
+
 			elif party_amount > total_negative_outstanding:
 				frappe.throw(_("Paid Amount cannot be greater than total negative outstanding amount {0}")
 					.format(total_negative_outstanding), InvalidPaymentEntry)
-			
+
 	def set_title(self):
 		if self.payment_type in ("Receive", "Pay"):
 			self.title = self.party
 		else:
 			self.title = self.paid_from + " - " + self.paid_to
-			
+
 	def validate_transaction_reference(self):
 		bank_account = self.paid_to if self.payment_type == "Receive" else self.paid_from
 		bank_account_type = frappe.db.get_value("Account", bank_account, "account_type")
-		
+
 		if bank_account_type == "Bank":
 			if not self.reference_no or not self.reference_date:
 				frappe.throw(_("Reference No and Reference Date is mandatory for Bank transaction"))
-				
+
 	def set_remarks(self):
 		if self.remarks: return
-		
+
 		if self.payment_type=="Internal Transfer":
 			remarks = [_("Amount {0} {1} transferred from {2} to {3}")
 				.format(self.paid_from_account_currency, self.paid_amount, self.paid_from, self.paid_to)]
 		else:
-			
+
 			remarks = [_("Amount {0} {1} {2} {3}").format(
 				self.party_account_currency,
 				self.paid_amount if self.payment_type=="Receive" else self.received_amount,
 				_("received from") if self.payment_type=="Receive" else _("to"), self.party
 			)]
-			
+
 		if self.reference_no:
 			remarks.append(_("Transaction reference no {0} dated {1}")
 				.format(self.reference_no, self.reference_date))
@@ -336,35 +370,35 @@ class PaymentEntry(AccountsController):
 		if self.payment_type in ["Receive", "Pay"]:
 			for d in self.get("references"):
 				if d.allocated_amount:
-					remarks.append(_("Amount {0} {1} against {2} {3}").format(self.party_account_currency, 
+					remarks.append(_("Amount {0} {1} against {2} {3}").format(self.party_account_currency,
 						d.allocated_amount, d.reference_doctype, d.reference_name))
-		
+
 		for d in self.get("deductions"):
 			if d.amount:
 				remarks.append(_("Amount {0} {1} deducted against {2}")
 					.format(self.company_currency, d.amount, d.account))
 
 		self.set("remarks", "\n".join(remarks))
-			
+
 	def make_gl_entries(self, cancel=0, adv_adj=0):
 		if self.payment_type in ("Receive", "Pay") and not self.get("party_account_field"):
 			self.setup_party_account_field()
-			
+
 		gl_entries = []
 		self.add_party_gl_entries(gl_entries)
 		self.add_bank_gl_entries(gl_entries)
 		self.add_deductions_gl_entries(gl_entries)
 
 		make_gl_entries(gl_entries, cancel=cancel, adv_adj=adv_adj)
-		
+
 	def add_party_gl_entries(self, gl_entries):
 		if self.party_account:
 			if self.payment_type=="Receive":
 				against_account = self.paid_to
 			else:
-				 against_account = self.paid_from
-			
-				
+				against_account = self.paid_from
+
+
 			party_gl_dict = self.get_gl_dict({
 				"account": self.party_account,
 				"party_type": self.party_type,
@@ -372,39 +406,39 @@ class PaymentEntry(AccountsController):
 				"against": against_account,
 				"account_currency": self.party_account_currency
 			})
-			
-			dr_or_cr = "credit" if self.party_type == "Customer" else "debit"
-			
+
+			dr_or_cr = "credit" if self.party_type in ["Customer", "Student"] else "debit"
+
 			for d in self.get("references"):
 				gle = party_gl_dict.copy()
 				gle.update({
 					"against_voucher_type": d.reference_doctype,
 					"against_voucher": d.reference_name
 				})
-				
-				allocated_amount_in_company_currency = flt(flt(d.allocated_amount) * flt(d.exchange_rate), 
-					self.precision("paid_amount"))	
-				
+
+				allocated_amount_in_company_currency = flt(flt(d.allocated_amount) * flt(d.exchange_rate),
+					self.precision("paid_amount"))
+
 				gle.update({
 					dr_or_cr + "_in_account_currency": d.allocated_amount,
 					dr_or_cr: allocated_amount_in_company_currency
 				})
-				
+
 				gl_entries.append(gle)
-				
+
 			if self.unallocated_amount:
 				base_unallocated_amount = base_unallocated_amount = self.unallocated_amount * \
 					(self.source_exchange_rate if self.payment_type=="Receive" else self.target_exchange_rate)
-					
+
 				gle = party_gl_dict.copy()
-				
+
 				gle.update({
 					dr_or_cr + "_in_account_currency": self.unallocated_amount,
 					dr_or_cr: base_unallocated_amount
 				})
 
 				gl_entries.append(gle)
-				
+
 	def add_bank_gl_entries(self, gl_entries):
 		if self.payment_type in ("Pay", "Internal Transfer"):
 			gl_entries.append(
@@ -426,14 +460,14 @@ class PaymentEntry(AccountsController):
 					"debit": self.base_received_amount
 				})
 			)
-			
+
 	def add_deductions_gl_entries(self, gl_entries):
 		for d in self.get("deductions"):
 			if d.amount:
 				account_currency = get_account_currency(d.account)
 				if account_currency != self.company_currency:
 					frappe.throw(_("Currency for {0} must be {1}").format(d.account, self.company_currency))
-					
+
 				gl_entries.append(
 					self.get_gl_dict({
 						"account": d.account,
@@ -444,108 +478,142 @@ class PaymentEntry(AccountsController):
 						"cost_center": d.cost_center
 					})
 				)
-				
+
 	def update_advance_paid(self):
 		if self.payment_type in ("Receive", "Pay") and self.party:
 			for d in self.get("references"):
 				if d.allocated_amount and d.reference_doctype in ("Sales Order", "Purchase Order"):
 					frappe.get_doc(d.reference_doctype, d.reference_name).set_total_advance_paid()
 
+	def update_expense_claim(self):
+		if self.payment_type in ("Pay") and self.party:
+			for d in self.get("references"):
+				if d.reference_doctype=="Expense Claim" and d.reference_name:
+					doc = frappe.get_doc("Expense Claim", d.reference_name)
+					update_reimbursed_amount(doc)
+
+	def on_recurring(self, reference_doc, subscription_doc):
+		self.reference_no = reference_doc.name
+		self.reference_date = nowdate()
+
 @frappe.whitelist()
 def get_outstanding_reference_documents(args):
-	args = json.loads(args)
+	if isinstance(args, basestring):
+		args = json.loads(args)
 
 	party_account_currency = get_account_currency(args.get("party_account"))
 	company_currency = frappe.db.get_value("Company", args.get("company"), "default_currency")
-	
+
 	# Get negative outstanding sales /purchase invoices
 	total_field = "base_grand_total" if party_account_currency == company_currency else "grand_total"
-		
-	negative_outstanding_invoices = get_negative_outstanding_invoices(args.get("party_type"), 
-		args.get("party"), args.get("party_account"), total_field)
 
-	# Get positive outstanding sales /purchase invoices
-	outstanding_invoices = get_outstanding_invoices(args.get("party_type"), args.get("party"), 
+	negative_outstanding_invoices = []
+	if (args.get("party_type") != "Student"):
+		negative_outstanding_invoices = get_negative_outstanding_invoices(args.get("party_type"),
+			args.get("party"), args.get("party_account"), total_field)
+
+	# Get positive outstanding sales /purchase invoices/ Fees
+	outstanding_invoices = get_outstanding_invoices(args.get("party_type"), args.get("party"),
 		args.get("party_account"))
-	
+
 	for d in outstanding_invoices:
 		d["exchange_rate"] = 1
-		if party_account_currency != company_currency \
-			and d.voucher_type in ("Sales Invoice", "Purchase Invoice"):
+		if party_account_currency != company_currency:
+			if d.voucher_type in ("Sales Invoice", "Purchase Invoice", "Expense Claim"):
 				d["exchange_rate"] = frappe.db.get_value(d.voucher_type, d.voucher_no, "conversion_rate")
+			elif d.voucher_type == "Journal Entry":
+				d["exchange_rate"] = get_exchange_rate(
+					party_account_currency,	company_currency, d.posting_date
+				)
+		if d.voucher_type in ("Purchase Invoice"):
+			d["bill_no"] = frappe.db.get_value(d.voucher_type, d.voucher_no, "bill_no")
 
 	# Get all SO / PO which are not fully billed or aginst which full advance not paid
-	orders_to_be_billed =  get_orders_to_be_billed(args.get("party_type"), args.get("party"), 
-		party_account_currency, company_currency)
-	
+	orders_to_be_billed = []
+	if (args.get("party_type") != "Student"):
+		orders_to_be_billed =  get_orders_to_be_billed(args.get("posting_date"),args.get("party_type"),
+			args.get("party"), party_account_currency, company_currency)
+
 	return negative_outstanding_invoices + outstanding_invoices + orders_to_be_billed
-	
-def get_orders_to_be_billed(party_type, party, party_account_currency, company_currency):
-	voucher_type = 'Sales Order' if party_type == "Customer" else 'Purchase Order'
 
-	ref_field = "base_grand_total" if party_account_currency == company_currency else "grand_total"
+def get_orders_to_be_billed(posting_date, party_type, party, party_account_currency, company_currency):
+	if party_type == "Customer":
+		voucher_type = 'Sales Order'
+	elif party_type == "Supplier":
+		voucher_type = 'Purchase Order'
+	elif party_type == "Employee":
+		voucher_type = None
 
-	orders = frappe.db.sql("""
-		select
-			name as voucher_no,
-			{ref_field} as invoice_amount,
-			({ref_field} - advance_paid) as outstanding_amount,
-			transaction_date as posting_date
-		from
-			`tab{voucher_type}`
-		where
-			{party_type} = %s
-			and docstatus = 1
-			and ifnull(status, "") != "Closed"
-			and {ref_field} > advance_paid
-			and abs(100 - per_billed) > 0.01
-		order by
-			transaction_date, name
-		""".format(**{
-			"ref_field": ref_field,
-			"voucher_type": voucher_type,
-			"party_type": scrub(party_type)
-		}), party, as_dict = True)
+	orders = []
+	if voucher_type:
+		ref_field = "base_grand_total" if party_account_currency == company_currency else "grand_total"
+
+		orders = frappe.db.sql("""
+			select
+				name as voucher_no,
+				{ref_field} as invoice_amount,
+				({ref_field} - advance_paid) as outstanding_amount,
+				transaction_date as posting_date
+			from
+				`tab{voucher_type}`
+			where
+				{party_type} = %s
+				and docstatus = 1
+				and ifnull(status, "") != "Closed"
+				and {ref_field} > advance_paid
+				and abs(100 - per_billed) > 0.01
+			order by
+				transaction_date, name
+			""".format(**{
+				"ref_field": ref_field,
+				"voucher_type": voucher_type,
+				"party_type": scrub(party_type)
+			}), party, as_dict = True)
 
 	order_list = []
 	for d in orders:
 		d["voucher_type"] = voucher_type
-		d["exchange_rate"] = get_exchange_rate(party_account_currency, company_currency)
+		# This assumes that the exchange rate required is the one in the SO
+		d["exchange_rate"] = get_exchange_rate(party_account_currency,
+			company_currency, posting_date)
 		order_list.append(d)
 
 	return order_list
-	
+
 def get_negative_outstanding_invoices(party_type, party, party_account, total_field):
-	voucher_type = "Sales Invoice" if party_type == "Customer" else "Purchase Invoice"
-	return frappe.db.sql("""
-		select
-			"{voucher_type}" as voucher_type, name as voucher_no, 
-			{total_field} as invoice_amount, outstanding_amount, posting_date, 
-			due_date, conversion_rate as exchange_rate
-		from
-			`tab{voucher_type}`
-		where
-			{party_type} = %s and {party_account} = %s and docstatus = 1 and outstanding_amount < 0
-		order by
-			posting_date, name
-		""".format(**{
-			"total_field": total_field,
-			"voucher_type": voucher_type,
-			"party_type": scrub(party_type),
-			"party_account": "debit_to" if party_type=="Customer" else "credit_to"
-		}), (party, party_account), as_dict = True)
-	
+	if party_type != "Employee":
+		voucher_type = "Sales Invoice" if party_type == "Customer" else "Purchase Invoice"
+		return frappe.db.sql("""
+			select
+				"{voucher_type}" as voucher_type, name as voucher_no,
+				{total_field} as invoice_amount, outstanding_amount, posting_date,
+				due_date, conversion_rate as exchange_rate
+			from
+				`tab{voucher_type}`
+			where
+				{party_type} = %s and {party_account} = %s and docstatus = 1 and outstanding_amount < 0
+			order by
+				posting_date, name
+			""".format(**{
+				"total_field": total_field,
+				"voucher_type": voucher_type,
+				"party_type": scrub(party_type),
+				"party_account": "debit_to" if party_type=="Customer" else "credit_to"
+			}), (party, party_account), as_dict = True)
+	else:
+		return []
+
 @frappe.whitelist()
 def get_party_details(company, party_type, party, date):
 	if not frappe.db.exists(party_type, party):
 		frappe.throw(_("Invalid {0}: {1}").format(party_type, party))
-		
+
 	party_account = get_party_account(party_type, party, company)
-	
+
 	account_currency = get_account_currency(party_account)
 	account_balance = get_balance_on(party_account, date)
 	party_balance = get_balance_on(party_type=party_type, party=party)
-	
+
 	return {
 		"party_account": party_account,
 		"party_account_currency": account_currency,
@@ -553,7 +621,7 @@ def get_party_details(company, party_type, party, date):
 		"account_balance": account_balance
 	}
 
-@frappe.whitelist()	
+@frappe.whitelist()
 def get_account_details(account, date):
 	frappe.has_permission('Payment Entry', throw=True)
 	return frappe._dict({
@@ -561,77 +629,104 @@ def get_account_details(account, date):
 		"account_balance": get_balance_on(account, date),
 		"account_type": frappe.db.get_value("Account", account, "account_type")
 	})
-	
+
 @frappe.whitelist()
 def get_company_defaults(company):
 	fields = ["write_off_account", "exchange_gain_loss_account", "cost_center"]
 	ret = frappe.db.get_value("Company", company, fields, as_dict=1)
-	
+
 	for fieldname in fields:
 		if not ret[fieldname]:
 			frappe.throw(_("Please set default {0} in Company {1}")
 				.format(frappe.get_meta("Company").get_label(fieldname), company))
-	
+
 	return ret
 
 @frappe.whitelist()
 def get_reference_details(reference_doctype, reference_name, party_account_currency):
 	total_amount = outstanding_amount = exchange_rate = None
 	ref_doc = frappe.get_doc(reference_doctype, reference_name)
-	
-	if reference_doctype != "Journal Entry":
+
+	if reference_doctype == "Fees":
+		total_amount = ref_doc.get("grand_total")
+		exchange_rate = 1
+		outstanding_amount = ref_doc.get("outstanding_amount")
+	elif reference_doctype != "Journal Entry":
 		if party_account_currency == ref_doc.company_currency:
-			total_amount = ref_doc.base_grand_total
+			if ref_doc.doctype == "Expense Claim":
+				total_amount = ref_doc.total_sanctioned_amount
+			else:
+				total_amount = ref_doc.base_grand_total
 			exchange_rate = 1
 		else:
 			total_amount = ref_doc.grand_total
+
+			# Get the exchange rate from the original ref doc
+			# or get it based on the posting date of the ref doc
 			exchange_rate = ref_doc.get("conversion_rate") or \
-				get_exchange_rate(party_account_currency, ref_doc.company_currency)
-		
+				get_exchange_rate(party_account_currency, ref_doc.company_currency, ref_doc.posting_date)
+
 		outstanding_amount = ref_doc.get("outstanding_amount") \
-			if reference_doctype in ("Sales Invoice", "Purchase Invoice") \
-			else flt(total_amount) - flt(ref_doc.advance_paid)			
+			if reference_doctype in ("Sales Invoice", "Purchase Invoice", "Expense Claim") \
+			else flt(total_amount) - flt(ref_doc.advance_paid)
 	else:
-		exchange_rate = get_exchange_rate(party_account_currency, ref_doc.company_currency)
-		
+		# Get the exchange rate based on the posting date of the ref doc
+		exchange_rate = get_exchange_rate(party_account_currency,
+			ref_doc.company_currency, ref_doc.posting_date)
+
 	return frappe._dict({
 		"due_date": ref_doc.get("due_date"),
 		"total_amount": total_amount,
 		"outstanding_amount": outstanding_amount,
 		"exchange_rate": exchange_rate
 	})
-	
+
 @frappe.whitelist()
 def get_payment_entry(dt, dn, party_amount=None, bank_account=None, bank_amount=None):
 	doc = frappe.get_doc(dt, dn)
-	
+
 	if dt in ("Sales Order", "Purchase Order") and flt(doc.per_billed, 2) > 0:
 		frappe.throw(_("Can only make payment against unbilled {0}").format(dt))
-	
-	party_type = "Customer" if dt in ("Sales Invoice", "Sales Order") else "Supplier"
+
+	if dt in ("Sales Invoice", "Sales Order"):
+		party_type = "Customer"
+	elif dt in ("Purchase Invoice", "Purchase Order"):
+		party_type = "Supplier"
+	elif dt in ("Expense Claim"):
+		party_type = "Employee"
+	elif dt in ("Fees"):
+		party_type = "Student"
 
 	# party account
 	if dt == "Sales Invoice":
 		party_account = doc.debit_to
 	elif dt == "Purchase Invoice":
 		party_account = doc.credit_to
+	elif dt == "Fees":
+		party_account = doc.receivable_account
 	else:
 		party_account = get_party_account(party_type, doc.get(party_type.lower()), doc.company)
-		
+
 	party_account_currency = doc.get("party_account_currency") or get_account_currency(party_account)
-	
+
 	# payment type
-	if (dt == "Sales Order" or (dt=="Sales Invoice" and doc.outstanding_amount > 0)) \
+	if (dt == "Sales Order" or (dt in ("Sales Invoice", "Fees") and doc.outstanding_amount > 0)) \
 		or (dt=="Purchase Invoice" and doc.outstanding_amount < 0):
 			payment_type = "Receive"
 	else:
 		payment_type = "Pay"
-	
+
 	# amounts
 	grand_total = outstanding_amount = 0
 	if party_amount:
 		grand_total = outstanding_amount = party_amount
 	elif dt in ("Sales Invoice", "Purchase Invoice"):
+		grand_total = doc.base_grand_total if party_account_currency == doc.company_currency else doc.grand_total
+		outstanding_amount = doc.outstanding_amount
+	elif dt in ("Expense Claim"):
+		grand_total = doc.total_sanctioned_amount
+		outstanding_amount = doc.total_sanctioned_amount - doc.total_amount_reimbursed
+	elif dt == "Fees":
 		grand_total = doc.grand_total
 		outstanding_amount = doc.outstanding_amount
 	else:
@@ -640,9 +735,9 @@ def get_payment_entry(dt, dn, party_amount=None, bank_account=None, bank_amount=
 		outstanding_amount = grand_total - flt(doc.advance_paid)
 
 	# bank or cash
-	bank = get_default_bank_cash_account(doc.company, "Bank", mode_of_payment=doc.get("mode_of_payment"), 
+	bank = get_default_bank_cash_account(doc.company, "Bank", mode_of_payment=doc.get("mode_of_payment"),
 		account=bank_account)
-	
+
 	paid_amount = received_amount = 0
 	if party_account_currency == bank.account_currency:
 		paid_amount = received_amount = abs(outstanding_amount)
@@ -654,7 +749,7 @@ def get_payment_entry(dt, dn, party_amount=None, bank_account=None, bank_amount=
 		received_amount = abs(outstanding_amount)
 		if bank_amount:
 			paid_amount = bank_amount
-	
+
 	pe = frappe.new_doc("Payment Entry")
 	pe.payment_type = payment_type
 	pe.company = doc.company
@@ -669,10 +764,13 @@ def get_payment_entry(dt, dn, party_amount=None, bank_account=None, bank_amount=
 	pe.paid_to_account_currency = party_account_currency if payment_type=="Pay" else bank.account_currency
 	pe.paid_amount = paid_amount
 	pe.received_amount = received_amount
-	
+	pe.allocate_payment_amount = 1
+	pe.letter_head = doc.get("letter_head")
+
 	pe.append("references", {
 		"reference_doctype": dt,
 		"reference_name": dn,
+		"bill_no": doc.get("bill_no"),
 		"due_date": doc.get("due_date"),
 		"total_amount": grand_total,
 		"outstanding_amount": outstanding_amount,

erpnext/accounts/doctype/payment_entry/test_payment_entry.py

@@ -10,6 +10,7 @@ from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_orde
 from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry, InvalidPaymentEntry
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
 from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
+from erpnext.hr.doctype.expense_claim.test_expense_claim import make_expense_claim
 
 test_dependencies = ["Item"]
 
@@ -20,80 +21,102 @@ class TestPaymentEntry(unittest.TestCase):
 		pe.paid_from = "Debtors - _TC"
 		pe.insert()
 		pe.submit()
-		
+
 		expected_gle = dict((d[0], d) for d in [
 			["Debtors - _TC", 0, 1000, so.name],
 			["_Test Cash - _TC", 1000.0, 0, None]
 		])
-		
+
 		self.validate_gl_entries(pe.name, expected_gle)
-		
+
 		so_advance_paid = frappe.db.get_value("Sales Order", so.name, "advance_paid")
 		self.assertEqual(so_advance_paid, 1000)
-		
+
 		pe.cancel()
-		
+
 		self.assertFalse(self.get_gle(pe.name))
-		
+
 		so_advance_paid = frappe.db.get_value("Sales Order", so.name, "advance_paid")
 		self.assertEqual(so_advance_paid, 0)
-		
+
 	def test_payment_entry_against_si_usd_to_usd(self):
 		si =  create_sales_invoice(customer="_Test Customer USD", debit_to="_Test Receivable USD - _TC",
 			currency="USD", conversion_rate=50)
 		pe = get_payment_entry("Sales Invoice", si.name, bank_account="_Test Bank USD - _TC")
 		pe.reference_no = "1"
 		pe.reference_date = "2016-01-01"
-		pe.target_exchange_rate = 50		
+		pe.target_exchange_rate = 50
 		pe.insert()
 		pe.submit()
-		
+
 		expected_gle = dict((d[0], d) for d in [
 			["_Test Receivable USD - _TC", 0, 5000, si.name],
 			["_Test Bank USD - _TC", 5000.0, 0, None]
 		])
-		
+
 		self.validate_gl_entries(pe.name, expected_gle)
-		
+
 		outstanding_amount = flt(frappe.db.get_value("Sales Invoice", si.name, "outstanding_amount"))
 		self.assertEqual(outstanding_amount, 0)
-		
+
 		pe.cancel()
 		self.assertFalse(self.get_gle(pe.name))
-		
+
 		outstanding_amount = flt(frappe.db.get_value("Sales Invoice", si.name, "outstanding_amount"))
 		self.assertEqual(outstanding_amount, 100)
-		
+
 	def test_payment_entry_against_pi(self):
 		pi =  make_purchase_invoice(supplier="_Test Supplier USD", debit_to="_Test Payable USD - _TC",
 			currency="USD", conversion_rate=50)
 		pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank USD - _TC")
 		pe.reference_no = "1"
 		pe.reference_date = "2016-01-01"
-		pe.source_exchange_rate = 50		
+		pe.source_exchange_rate = 50
 		pe.insert()
 		pe.submit()
-		
+
 		expected_gle = dict((d[0], d) for d in [
 			["_Test Payable USD - _TC", 12500, 0, pi.name],
 			["_Test Bank USD - _TC", 0, 12500, None]
 		])
-		
+
 		self.validate_gl_entries(pe.name, expected_gle)
-		
+
 		outstanding_amount = flt(frappe.db.get_value("Sales Invoice", pi.name, "outstanding_amount"))
 		self.assertEqual(outstanding_amount, 0)
-		
+
+	def test_payment_entry_against_ec(self):
+
+		payable = frappe.db.get_value('Company', "_Test Company", 'default_payable_account')
+		ec =  make_expense_claim(payable, 300, 300, "_Test Company","Travel Expenses - _TC")
+		pe = get_payment_entry("Expense Claim", ec.name, bank_account="_Test Bank USD - _TC", bank_amount=300)
+		pe.reference_no = "1"
+		pe.reference_date = "2016-01-01"
+		pe.source_exchange_rate = 1
+		pe.insert()
+		pe.submit()
+
+		expected_gle = dict((d[0], d) for d in [
+			[payable, 300, 0, ec.name],
+			["_Test Bank USD - _TC", 0, 300, None]
+		])
+
+		self.validate_gl_entries(pe.name, expected_gle)
+
+		outstanding_amount = flt(frappe.db.get_value("Expense Claim", ec.name, "total_sanctioned_amount")) - \
+			flt(frappe.db.get_value("Expense Claim", ec.name, "total_amount_reimbursed"))
+		self.assertEqual(outstanding_amount, 0)
+
 	def test_payment_entry_against_si_usd_to_inr(self):
 		si =  create_sales_invoice(customer="_Test Customer USD", debit_to="_Test Receivable USD - _TC",
 			currency="USD", conversion_rate=50)
-		pe = get_payment_entry("Sales Invoice", si.name, party_amount=20, 
+		pe = get_payment_entry("Sales Invoice", si.name, party_amount=20,
 			bank_account="_Test Bank - _TC", bank_amount=900)
 		pe.reference_no = "1"
 		pe.reference_date = "2016-01-01"
-		
+
 		self.assertEqual(pe.difference_amount, 100)
-		
+
 		pe.append("deductions", {
 			"account": "_Test Exchange Gain/Loss - _TC",
 			"cost_center": "_Test Cost Center - _TC",
@@ -101,18 +124,46 @@ class TestPaymentEntry(unittest.TestCase):
 		})
 		pe.insert()
 		pe.submit()
-		
+
 		expected_gle = dict((d[0], d) for d in [
 			["_Test Receivable USD - _TC", 0, 1000, si.name],
 			["_Test Bank - _TC", 900, 0, None],
 			["_Test Exchange Gain/Loss - _TC", 100.0, 0, None],
 		])
-		
+
 		self.validate_gl_entries(pe.name, expected_gle)
-		
+
 		outstanding_amount = flt(frappe.db.get_value("Sales Invoice", si.name, "outstanding_amount"))
 		self.assertEqual(outstanding_amount, 80)
-		
+
+	def test_payment_entry_retrieves_last_exchange_rate(self):
+		from erpnext.setup.doctype.currency_exchange.test_currency_exchange import test_records, save_new_records
+
+		test_records = test_records
+		save_new_records(test_records)
+
+		pe = frappe.new_doc("Payment Entry")
+		pe.payment_type = "Pay"
+		pe.company = "_Test Company"
+		pe.posting_date = "2016-01-10"
+		pe.paid_from = "_Test Bank USD - _TC"
+		pe.paid_to = "_Test Bank - _TC"
+		pe.paid_amount = 100
+		pe.reference_no = "3"
+		pe.reference_date = "2016-01-10"
+		pe.party_type = "Supplier"
+		pe.party = "_Test Supplier USD"
+
+		pe.setup_party_account_field()
+		pe.set_missing_values()
+		pe.set_exchange_rate()
+		pe.set_amounts()
+
+		self.assertEqual(
+			pe.source_exchange_rate, 65.1,
+			"{0} is not equal to {1}".format(pe.source_exchange_rate, 65.1)
+		)
+
 	def test_internal_transfer_usd_to_inr(self):
 		pe = frappe.new_doc("Payment Entry")
 		pe.payment_type = "Internal Transfer"
@@ -124,31 +175,31 @@ class TestPaymentEntry(unittest.TestCase):
 		pe.received_amount = 4500
 		pe.reference_no = "2"
 		pe.reference_date = nowdate()
-		
+
 		pe.setup_party_account_field()
 		pe.set_missing_values()
 		pe.set_exchange_rate()
 		pe.set_amounts()
-				
+
 		self.assertEquals(pe.difference_amount, 500)
-		
+
 		pe.append("deductions", {
 			"account": "_Test Exchange Gain/Loss - _TC",
 			"cost_center": "_Test Cost Center - _TC",
 			"amount": 500
 		})
-		
+
 		pe.insert()
 		pe.submit()
-		
+
 		expected_gle = dict((d[0], d) for d in [
 			["_Test Bank USD - _TC", 0, 5000, None],
 			["_Test Bank - _TC", 4500, 0, None],
 			["_Test Exchange Gain/Loss - _TC", 500.0, 0, None],
 		])
-		
+
 		self.validate_gl_entries(pe.name, expected_gle)
-		
+
 	def test_payment_against_negative_sales_invoice(self):
 		pe1 = frappe.new_doc("Payment Entry")
 		pe1.payment_type = "Pay"
@@ -158,33 +209,33 @@ class TestPaymentEntry(unittest.TestCase):
 		pe1.paid_from = "_Test Cash - _TC"
 		pe1.paid_amount = 100
 		pe1.received_amount = 100
-		
+
 		self.assertRaises(InvalidPaymentEntry, pe1.validate)
-		
+
 		si1 =  create_sales_invoice()
-		
+
 		# create full payment entry against si1
 		pe2 = get_payment_entry("Sales Invoice", si1.name, bank_account="_Test Cash - _TC")
 		pe2.insert()
 		pe2.submit()
-		
+
 		# create return entry against si1
 		create_sales_invoice(is_return=1, return_against=si1.name, qty=-1)
 		si1_outstanding = frappe.db.get_value("Sales Invoice", si1.name, "outstanding_amount")
 		self.assertEqual(si1_outstanding, -100)
-		
+
 		# pay more than outstanding against si1
 		pe3 = get_payment_entry("Sales Invoice", si1.name, bank_account="_Test Cash - _TC")
 		pe3.paid_amount = pe3.received_amount = 300
 		self.assertRaises(InvalidPaymentEntry, pe3.validate)
-		
+
 		# pay negative outstanding against si1
 		pe3.paid_to = "Debtors - _TC"
 		pe3.paid_amount = pe3.received_amount = 100
-		
+
 		pe3.insert()
 		pe3.submit()
-		
+
 		expected_gle = dict((d[0], d) for d in [
 			["Debtors - _TC", 100, 0, si1.name],
 			["_Test Cash - _TC", 0, 100, None]
@@ -200,10 +251,10 @@ class TestPaymentEntry(unittest.TestCase):
 
 		outstanding_amount = flt(frappe.db.get_value("Sales Invoice", si1.name, "outstanding_amount"))
 		self.assertEqual(outstanding_amount, -100)
-		
+
 	def validate_gl_entries(self, voucher_no, expected_gle):
 		gl_entries = self.get_gle(voucher_no)
-			
+
 		self.assertTrue(gl_entries)
 
 		for i, gle in enumerate(gl_entries):
@@ -211,8 +262,70 @@ class TestPaymentEntry(unittest.TestCase):
 			self.assertEquals(expected_gle[gle.account][1], gle.debit)
 			self.assertEquals(expected_gle[gle.account][2], gle.credit)
 			self.assertEquals(expected_gle[gle.account][3], gle.against_voucher)
-		
+
 	def get_gle(self, voucher_no):
 		return frappe.db.sql("""select account, debit, credit, against_voucher
 			from `tabGL Entry` where voucher_type='Payment Entry' and voucher_no=%s
 			order by account asc""", voucher_no, as_dict=1)
+
+	def test_payment_entry_write_off_difference(self):
+		si =  create_sales_invoice()
+		pe = get_payment_entry("Sales Invoice", si.name, bank_account="_Test Cash - _TC")
+		pe.reference_no = "1"
+		pe.reference_date = "2016-01-01"
+		pe.received_amount = pe.paid_amount = 110
+		pe.insert()
+
+		self.assertEqual(pe.unallocated_amount, 10)
+
+		pe.received_amount = pe.paid_amount = 95
+		pe.append("deductions", {
+			"account": "_Test Write Off - _TC",
+			"cost_center": "_Test Cost Center - _TC",
+			"amount": 5
+		})
+		pe.save()
+
+		self.assertEqual(pe.unallocated_amount, 0)
+		self.assertEqual(pe.difference_amount, 0)
+
+		pe.submit()
+
+		expected_gle = dict((d[0], d) for d in [
+			["Debtors - _TC", 0, 100, si.name],
+			["_Test Cash - _TC", 95, 0, None],
+			["_Test Write Off - _TC", 5, 0, None]
+		])
+
+		self.validate_gl_entries(pe.name, expected_gle)
+
+	def test_payment_entry_exchange_gain_loss(self):
+		si =  create_sales_invoice(customer="_Test Customer USD", debit_to="_Test Receivable USD - _TC",
+			currency="USD", conversion_rate=50)
+		pe = get_payment_entry("Sales Invoice", si.name, bank_account="_Test Bank USD - _TC")
+		pe.reference_no = "1"
+		pe.reference_date = "2016-01-01"
+		pe.target_exchange_rate = 55
+
+		pe.append("deductions", {
+			"account": "_Test Exchange Gain/Loss - _TC",
+			"cost_center": "_Test Cost Center - _TC",
+			"amount": -500
+		})
+		pe.save()
+
+		self.assertEqual(pe.unallocated_amount, 0)
+		self.assertEqual(pe.difference_amount, 0)
+
+		pe.submit()
+
+		expected_gle = dict((d[0], d) for d in [
+			["_Test Receivable USD - _TC", 0, 5000, si.name],
+			["_Test Bank USD - _TC", 5500, 0, None],
+			["_Test Exchange Gain/Loss - _TC", 0, 500, None],
+		])
+
+		self.validate_gl_entries(pe.name, expected_gle)
+
+		outstanding_amount = flt(frappe.db.get_value("Sales Invoice", si.name, "outstanding_amount"))
+		self.assertEqual(outstanding_amount, 0)

erpnext/accounts/doctype/payment_entry/tests/test_payment_against_invoice.js

@@ -0,0 +1,55 @@
+QUnit.module('Payment Entry');
+
+QUnit.test("test payment entry", function(assert) {
+	assert.expect(6);
+	let done = assert.async();
+	frappe.run_serially([
+		() => {
+			return frappe.tests.make('Sales Invoice', [
+				{customer: 'Test Customer 1'},
+				{items: [
+					[
+						{'item_code': 'Test Product 1'},
+						{'qty': 1},
+						{'rate': 101},
+					]
+				]}
+			]);
+		},
+		() => cur_frm.save(),
+		() => frappe.tests.click_button('Submit'),
+		() => frappe.tests.click_button('Yes'),
+		() => frappe.timeout(1),
+		() => frappe.tests.click_button('Close'),
+		() => frappe.timeout(1),
+		() => frappe.click_button('Make'),
+		() => frappe.timeout(1),
+		() => frappe.click_link('Payment'),
+		() => frappe.timeout(2),
+		() => {
+			assert.equal(frappe.get_route()[1], 'Payment Entry',
+				'made payment entry');
+			assert.equal(cur_frm.doc.party, 'Test Customer 1',
+				'customer set in payment entry');
+			assert.equal(cur_frm.doc.paid_amount, 101,
+				'paid amount set in payment entry');
+			assert.equal(cur_frm.doc.references[0].allocated_amount, 101,
+				'amount allocated against sales invoice');
+		},
+		() => frappe.timeout(1),
+		() => cur_frm.set_value('paid_amount', 100),
+		() => frappe.timeout(1),
+		() => {
+			frappe.model.set_value("Payment Entry Reference", cur_frm.doc.references[0].name,
+				"allocated_amount", 101);
+		},
+		() => frappe.timeout(1),
+		() => frappe.click_button('Write Off Difference Amount'),
+		() => frappe.timeout(1),
+		() => {
+			assert.equal(cur_frm.doc.difference_amount, 0, 'difference amount is zero');
+			assert.equal(cur_frm.doc.deductions[0].amount, 1, 'Write off amount = 1');
+		},
+		() => done()
+	]);
+});

erpnext/accounts/doctype/payment_entry/tests/test_payment_against_purchase_invoice.js

@@ -0,0 +1,60 @@
+QUnit.module('Payment Entry');
+
+QUnit.test("test payment entry", function(assert) {
+	assert.expect(7	);
+	let done = assert.async();
+
+	frappe.run_serially([
+		() => {
+			return frappe.tests.make('Purchase Invoice', [
+				{supplier: 'Test Supplier'},
+				{bill_no: 'in1234'},
+				{items: [
+					[
+						{'qty': 2},
+						{'item_code': 'Test Product 1'},
+						{'rate':1000},
+					]
+				]},
+				{update_stock:1},
+				{supplier_address: 'Test1-Billing'},
+				{contact_person: 'Contact 3-Test Supplier'},
+				{tc_name: 'Test Term 1'},
+				{terms: 'This is just a Test'}
+			]);
+		},
+
+		() => cur_frm.save(),
+		() => frappe.tests.click_button('Submit'),
+		() => frappe.tests.click_button('Yes'),
+		() => frappe.timeout(1),
+		() => frappe.click_button('Make'),
+		() => frappe.timeout(2),
+		() => frappe.click_link('Payment'),
+		() => frappe.timeout(3),
+		() => cur_frm.set_value('mode_of_payment','Cash'),
+		() => frappe.timeout(3),
+		() => {
+			assert.equal(frappe.get_route()[1], 'Payment Entry',
+				'made payment entry');
+			assert.equal(cur_frm.doc.party, 'Test Supplier',
+				'supplier set in payment entry');
+			assert.equal(cur_frm.doc.paid_amount, 2000,
+				'paid amount set in payment entry');
+			assert.equal(cur_frm.doc.references[0].allocated_amount, 2000,
+				'amount allocated against purchase invoice');
+			assert.equal(cur_frm.doc.references[0].bill_no, 'in1234',
+				'invoice number allocated against purchase invoice');
+			assert.equal(cur_frm.get_field('total_allocated_amount').value, 2000,
+				'correct amount allocated in Write Off');
+			assert.equal(cur_frm.get_field('unallocated_amount').value, 0,
+				'correct amount unallocated in Write Off');
+		},
+
+		() => cur_frm.save(),
+		() => frappe.tests.click_button('Submit'),
+		() => frappe.tests.click_button('Yes'),
+		() => frappe.timeout(3),
+		() => done()
+	]);
+});

erpnext/accounts/doctype/payment_entry/tests/test_payment_entry.js

@@ -0,0 +1,28 @@
+QUnit.module('Accounts');
+
+QUnit.test("test payment entry", function(assert) {
+	assert.expect(1);
+	let done = assert.async();
+	frappe.run_serially([
+		() => {
+			return frappe.tests.make('Payment Entry', [
+				{payment_type:'Receive'},
+				{mode_of_payment:'Cash'},
+				{party_type:'Customer'},
+				{party:'Test Customer 3'},
+				{paid_amount:675},
+				{reference_no:123},
+				{reference_date: frappe.datetime.add_days(frappe.datetime.nowdate(), 0)},
+			]);
+		},
+		() => cur_frm.save(),
+		() => {
+			// get_item_details
+			assert.ok(cur_frm.doc.total_allocated_amount==675, "Allocated AmountCorrect");
+		},
+		() => frappe.tests.click_button('Submit'),
+		() => frappe.tests.click_button('Yes'),
+		() => frappe.timeout(0.3),
+		() => done()
+	]);
+});

erpnext/accounts/doctype/payment_entry/tests/test_payment_entry_write_off.js

@@ -0,0 +1,67 @@
+QUnit.module('Payment Entry');
+
+QUnit.test("test payment entry", function(assert) {
+	assert.expect(8);
+	let done = assert.async();
+	frappe.run_serially([
+		() => {
+			return frappe.tests.make('Sales Invoice', [
+				{customer: 'Test Customer 1'},
+				{company: 'For Testing'},
+				{currency: 'INR'},
+				{selling_price_list: '_Test Price List'},
+				{items: [
+					[
+						{'qty': 1},
+						{'item_code': 'Test Product 1'},
+					]
+				]}
+			]);
+		},
+		() => frappe.timeout(1),
+		() => cur_frm.save(),
+		() => frappe.tests.click_button('Submit'),
+		() => frappe.tests.click_button('Yes'),
+		() => frappe.timeout(1.5),
+		() => frappe.click_button('Close'),
+		() => frappe.timeout(0.5),
+		() => frappe.click_button('Make'),
+		() => frappe.timeout(1),
+		() => frappe.click_link('Payment'),
+		() => frappe.timeout(2),
+		() => cur_frm.set_value("paid_to", "_Test Cash - FT"),
+		() => frappe.timeout(0.5),
+		() => {
+			assert.equal(frappe.get_route()[1], 'Payment Entry', 'made payment entry');
+			assert.equal(cur_frm.doc.party, 'Test Customer 1', 'customer set in payment entry');
+			assert.equal(cur_frm.doc.paid_from, 'Debtors - FT', 'customer account set in payment entry');
+			assert.equal(cur_frm.doc.paid_amount, 100, 'paid amount set in payment entry');
+			assert.equal(cur_frm.doc.references[0].allocated_amount, 100,
+				'amount allocated against sales invoice');
+		},
+		() => cur_frm.set_value('paid_amount', 95),
+		() => frappe.timeout(1),
+		() => {
+			frappe.model.set_value("Payment Entry Reference",
+				cur_frm.doc.references[0].name, "allocated_amount", 100);
+		},
+		() => frappe.timeout(.5),
+		() => {
+			assert.equal(cur_frm.doc.difference_amount, 5, 'difference amount is 5');
+		},
+		() => {
+			frappe.db.set_value("Company", "For Testing", "write_off_account", "_Test Write Off - FT");
+			frappe.timeout(1);
+			frappe.db.set_value("Company", "For Testing",
+				"exchange_gain_loss_account", "_Test Exchange Gain/Loss - FT");
+		},
+		() => frappe.timeout(1),
+		() => frappe.click_button('Write Off Difference Amount'),
+		() => frappe.timeout(2),
+		() => {
+			assert.equal(cur_frm.doc.difference_amount, 0, 'difference amount is zero');
+			assert.equal(cur_frm.doc.deductions[0].amount, 5, 'Write off amount = 5');
+		},
+		() => done()
+	]);
+});

erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json

@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "beta": 0, 
@@ -9,18 +10,23 @@
  "doctype": "DocType", 
  "document_type": "", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "reference_doctype", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -30,6 +36,7 @@
    "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, 
@@ -37,16 +44,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "reference_name", 
    "fieldtype": "Dynamic Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -56,6 +67,7 @@
    "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, 
@@ -63,16 +75,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "due_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": "Due Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -81,6 +97,7 @@
    "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, 
@@ -88,16 +105,51 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "bill_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": "Supplier Invoice No", 
+   "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, 
+   "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, 
@@ -105,6 +157,7 @@
    "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, 
@@ -112,16 +165,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "total_amount", 
    "fieldtype": "Float", 
    "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": "Total Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -130,6 +187,7 @@
    "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, 
@@ -137,16 +195,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "outstanding_amount", 
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Outstanding", 
    "length": 0, 
    "no_copy": 0, 
@@ -155,6 +217,7 @@
    "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, 
@@ -162,16 +225,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "allocated_amount", 
    "fieldtype": "Float", 
    "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": "Allocated", 
    "length": 0, 
    "no_copy": 0, 
@@ -180,6 +247,7 @@
    "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, 
@@ -187,16 +255,21 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:(doc.reference_doctype=='Purchase Invoice')", 
    "fieldname": "exchange_rate", 
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Exchange Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -205,6 +278,7 @@
    "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, 
@@ -212,17 +286,17 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 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-07-14 14:48:13.356944", 
+ "modified": "2017-10-16 17:37:01.192312", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Entry Reference", 
@@ -232,7 +306,9 @@
  "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/payment_reconciliation/payment_reconciliation.js

@@ -4,28 +4,17 @@
 frappe.provide("erpnext.accounts");
 
 erpnext.accounts.PaymentReconciliationController = frappe.ui.form.Controller.extend({
-	setup: function() {
-		this.frm.get_field('payments').grid.editable_fields = [
-			{fieldname: 'reference_name', columns: 3},
-			{fieldname: 'invoice_number', columns: 3},
-			{fieldname: 'amount', columns: 2},
-			{fieldname: 'allocated_amount', columns: 2}
-		];
-	},
-
 	onload: function() {
 		var me = this
-		this.frm.set_query('party_type', function() {
-			return {
-				filters: {
-					"name": ["in", ["Customer", "Supplier"]]
-				}
-			};
+		this.frm.set_query("party_type", function() {
+			return{
+				query: "erpnext.setup.doctype.party_type.party_type.get_party_type"
+			}
 		});
 
 		this.frm.set_query('receivable_payable_account', function() {
 			if(!me.frm.doc.company || !me.frm.doc.party_type) {
-				msgprint(__("Please select Company and Party Type first"));
+				frappe.msgprint(__("Please select Company and Party Type first"));
 			} else {
 				return{
 					filters: {
@@ -40,7 +29,7 @@ erpnext.accounts.PaymentReconciliationController = frappe.ui.form.Controller.ext
 
 		this.frm.set_query('bank_cash_account', function() {
 			if(!me.frm.doc.company) {
-				msgprint(__("Please select Company first"));
+				frappe.msgprint(__("Please select Company first"));
 			} else {
 				return{
 					filters:[
@@ -107,10 +96,11 @@ erpnext.accounts.PaymentReconciliationController = frappe.ui.form.Controller.ext
 	},
 
 	set_invoice_options: function() {
+		var me = this;
 		var invoices = [];
 
 		$.each(me.frm.doc.invoices || [], function(i, row) {
-			if (row.invoice_number && !inList(invoices, row.invoice_number))
+			if (row.invoice_number && !in_list(invoices, row.invoice_number))
 				invoices.push(row.invoice_type + " | " + row.invoice_number);
 		});
 
@@ -119,7 +109,7 @@ erpnext.accounts.PaymentReconciliationController = frappe.ui.form.Controller.ext
 				me.frm.doc.name).options = "\n" + invoices.join("\n");
 
 			$.each(me.frm.doc.payments || [], function(i, p) {
-				if(!inList(invoices, cstr(p.invoice_number))) p.invoice_number = null;
+				if(!in_list(invoices, cstr(p.invoice_number))) p.invoice_number = null;
 			});
 		}