Replace create_custom_fields with create_custom_field (#11420)

* Set transaction type in pricing rule only if unavailable

* Use scrub instead for party_type with space

.eslintrc

@@ -52,7 +52,6 @@
 		"frappe": true,
 		"erpnext": true,
 		"schools": true,
-		"education": true,
 
 		"$": true,
 		"jQuery": true,
@@ -133,7 +132,6 @@
 		"get_url_arg": true,
 		"get_server_fields": true,
 		"set_multiple": true,
-		"QUnit": true,
-		"Chart": true
+		"QUnit": true
 	}
 }

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,68 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-
----
-
-Issue: Bug report
-
-Our project, as you've probably heard, is getting really popular and truth is we're getting a bit overwhelmed by the activity surrounding it. There are just too many issues for us to manage properly.
-
-**Do the checklist before filing an issue:**
- - [ ] Have a usage question? Ask your question on  [Discuss Forum](https://discuss.erpnext.com). We use [Discuss Forum](https://discuss.erpnext.com) for usage question and GitHub for bugs.
- - [ ] Can you replicate the issue? 
- - [ ] Is this something you can debug and fix? Send a pull request! Bug fixes and documentation fixes are welcome
-
-**Describe the bug** :chart_with_downwards_trend: 
-A clear and concise description of what the bug is.
-
-**To Reproduce** :page_with_curl:
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior** :chart_with_upwards_trend:
-A clear and concise description of what you expected to happen.
-
-**Screenshots** :crystal_ball:
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):** :cyclone:
- - OS:
-    - [ ] Linux
-    - [ ] macOS
-    - [ ] Windows
-    - [ ] Others? Please mention: 
- - Browser:
-    - [ ] Safari
-    - [ ] Chrome
-    - [ ] Firefox
-    - [ ] Other? Please mention: 
-
-**Smartphone (please complete the following information):** :iphone: :computer:
- - Device:
-    - [ ] iPhone
-    - [ ] Android
- - Browser:
-    - [ ] Safari
-    - [ ] Chrome
-    - [ ] Firefox
-    - [ ] Other? Please mention: 
-
-**Version Information**
-- Which branch are you on?
-    - [ ] `master` :star2: 
-    - [ ] `develop` :fire:
-- Frappe Version: 
-- ERPNext Version: 
-
-**Additional context** :page_facing_up:
-Add any other context about the problem here.
-
-**Possible Solution** :bookmark_tabs:
-Any idea what might be causing the issue. Or if you have a proposed solution to the problem,
-
-**Please don't be intimidated by the long list of options you've fill. Try to fill out as much as you can. Remember, the more the information the easier it is for us to replicate and fix the issue** :grin: 
-

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,21 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-
----
-
-Issue: Feature Request
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
-
-

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,28 +0,0 @@
-Pull-Request
-
-- [ ] Have you followed the guidelines in our Contributing document?
-- [ ] Have you checked to ensure there aren't other open [Pull Requests](../pulls) for the same update/change?
-- [ ] Have you lint your code locally prior to submission?
-- [ ] Have you successfully run tests with your changes locally?
-- [ ] Does your commit message have an explanation for your changes and why you'd like us to include them?
-- [ ] Docs have been added / updated
-- [ ] Tests for the changes have been added (for bug fixes / features)
-- [ ] Did you modify the existing test cases? If yes, why?
-
----
-
-What type of a PR is this? 
-
-- [ ] Changes to Existing Features
-- [ ] New Feature Submissions
-- [ ] Bug Fix
-- [ ] Breaking Change
-
---- 
-
-- Motivation and Context (What existing problem does the pull request solve):
-- Related Issue: 
-- Screenshots (if applicable, remember, a picture tells a thousand words): 
-
-**Please don't be intimidated by the long list of options you've fill. Try to fill out as much as you can. Remember, the more the information the easier it is for us to test and get your pull request merged** :grin: 
-

.gitignore

@@ -8,4 +8,3 @@ latest_updates.json
 *.egg-info
 dist/
 erpnext/docs/current
-*.swp

.travis.yml

@@ -1,6 +1,13 @@
 language: python
 dist: trusty
 
+addons:
+  apt:
+    sources:
+      - google-chrome
+    packages:
+      - google-chrome-stable
+
 python:
   - "2.7"
 
@@ -11,7 +18,6 @@ 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 install hhvm && rm -rf /home/travis/.kiex/
   - sudo apt-get purge -y mysql-common mysql-server mysql-client
   - nvm install v7.10.0
   - wget https://raw.githubusercontent.com/frappe/bench/master/playbooks/install.py
@@ -23,6 +29,15 @@ install:
   - cp -r $TRAVIS_BUILD_DIR/test_sites/test_site ~/frappe-bench/sites/
 
 before_script:
+  - wget http://chromedriver.storage.googleapis.com/2.27/chromedriver_linux64.zip
+  - unzip chromedriver_linux64.zip
+  - sudo apt-get install libnss3
+  - sudo apt-get --only-upgrade install google-chrome-stable
+  - sudo cp chromedriver /usr/local/bin/.
+  - sudo chmod +x /usr/local/bin/chromedriver
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+  - sleep 3
   - mysql -u root -ptravis -e 'create database test_frappe'
   - echo "USE mysql;\nCREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe';\nFLUSH PRIVILEGES;\n" | mysql -u root -ptravis
   - echo "USE mysql;\nGRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost';\n" | mysql -u root -ptravis
@@ -33,7 +48,6 @@ before_script:
   - bench reinstall --yes
   - bench build
   - bench scheduler disable
-  - sed -i 's/9000/9001/g' sites/common_site_config.json
   - bench start &
   - sleep 10
 
@@ -46,7 +60,8 @@ jobs:
       env: Server Side Test
     - # stage
       script:
-        - wget http://build.erpnext.com/20171108_190013_955977f8_database.sql.gz
-        - bench --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz --mariadb-root-password travis
-        - bench migrate
-      env: Patch Testing
+        - 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
+

erpnext/__init__.py

@@ -3,9 +3,8 @@ from __future__ import unicode_literals
 import inspect
 import frappe
 from erpnext.hooks import regional_overrides
-from frappe.utils import getdate
 
-__version__ = '10.1.52'
+__version__ = '8.11.6'
 
 def get_default_company(user=None):
 	'''Get default company for user'''
@@ -109,16 +108,3 @@ def allow_regional(fn):
 
 	return caller
 
-def get_last_membership():
-	'''Returns last membership if exists'''
-	last_membership = frappe.get_all('Membership', 'name,to_date,membership_type',
-		dict(member=frappe.session.user, paid=1), order_by='to_date desc', limit=1)
-
-	return last_membership and last_membership[0]
-
-def is_member():
-	'''Returns true if the user is still a member'''
-	last_membership = get_last_membership()
-	if last_membership and getdate(last_membership.to_date) > getdate():
-		return True
-	return False

erpnext/accounts/doctype/account/account.js

@@ -47,18 +47,6 @@ frappe.ui.form.on('Account', {
 			// show / hide convert buttons
 			frm.trigger('add_toolbar_buttons');
 		}
-
-		if(!frm.doc.__islocal) {
-			frm.add_custom_button(__('Update Account Name / Number'), function () {
-				frm.trigger("update_account_number");
-			});
-		}
-
-		if(!frm.doc.__islocal) {
-			frm.add_custom_button(__('Merge Account'), function () {
-				frm.trigger("merge_account");
-			});
-		}
 	},
 	account_type: function (frm) {
 		if (frm.doc.is_group == 0) {
@@ -102,93 +90,6 @@ frappe.ui.form.on('Account', {
 				});
 			});
 		}
-	},
 
-	merge_account: function(frm) {
-		var d = new frappe.ui.Dialog({
-			title: __('Merge with Existing Account'),
-			fields: [
-				{
-					"label" : "Name",
-					"fieldname": "name",
-					"fieldtype": "Data",
-					"reqd": 1,
-					"default": frm.doc.name
-				}
-			],
-			primary_action: function() {
-				var data = d.get_values();
-				frappe.call({
-					method: "erpnext.accounts.doctype.account.account.merge_account",
-					args: {
-						old: frm.doc.name,
-						new: data.name,
-						is_group: frm.doc.is_group,
-						root_type: frm.doc.root_type,
-						company: frm.doc.company
-					},
-					callback: function(r) {
-						if(!r.exc) {
-							if(r.message) {
-								frappe.set_route("Form", "Account", r.message);
-							}
-							d.hide();
-						}
-					}
-				});
-			},
-			primary_action_label: __('Merge')
-		});
-		d.show();
-	},
-
-	update_account_number: function(frm) {
-		var d = new frappe.ui.Dialog({
-			title: __('Update Account Number / Name'),
-			fields: [
-				{
-					"label": "Account Name",
-					"fieldname": "account_name",
-					"fieldtype": "Data",
-					"reqd": 1,
-					"default": frm.doc.account_name
-				},
-				{
-					"label": "Account Number",
-					"fieldname": "account_number",
-					"fieldtype": "Data",
-					"default": frm.doc.account_number
-				}
-			],
-			primary_action: function() {
-				var data = d.get_values();
-				if(data.account_number === frm.doc.account_number && data.account_name === frm.doc.account_name) {
-					d.hide();
-					return;
-				}
-
-				frappe.call({
-					method: "erpnext.accounts.doctype.account.account.update_account_number",
-					args: {
-						account_number: data.account_number,
-						account_name: data.account_name,
-						name: frm.doc.name
-					},
-					callback: function(r) {
-						if(!r.exc) {
-							if(r.message) {
-								frappe.set_route("Form", "Account", r.message);
-							} else {
-								frm.set_value("account_number", data.account_number);
-								frm.set_value("account_name", data.account_name);
-							}
-							d.hide();
-						}
-					}
-				});
-			},
-			primary_action_label: __('Update')
-		});
-		d.show();
 	}
-});
+});

erpnext/accounts/doctype/account/account.json

@@ -2,7 +2,7 @@
  "allow_copy": 1, 
  "allow_guest_to_view": 0, 
  "allow_import": 1, 
- "allow_rename": 0, 
+ "allow_rename": 1, 
  "beta": 0, 
  "creation": "2013-01-30 12:49:46", 
  "custom": 0, 
@@ -40,7 +40,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -69,7 +68,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0, 
    "width": "50%"
   }, 
@@ -102,38 +100,6 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "account_number", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Account Number", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -165,7 +131,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -198,7 +163,6 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -229,7 +193,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -260,7 +223,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -293,7 +255,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -322,7 +283,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0, 
    "width": "50%"
   }, 
@@ -356,7 +316,6 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -390,7 +349,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -423,7 +381,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -457,7 +414,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -488,7 +444,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -518,7 +473,6 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -548,7 +502,6 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -578,7 +531,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }
  ], 
@@ -593,7 +545,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-07-08 09:47:04.287841", 
+ "modified": "2017-08-11 15:28:35.855809", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Account", 
@@ -703,7 +655,7 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "search_fields": "account_number", 
+ "search_fields": "", 
  "show_name_in_global_search": 1, 
  "sort_order": "ASC", 
  "track_changes": 1, 

erpnext/accounts/doctype/account/account.py

@@ -3,14 +3,14 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.utils import cint, cstr
+from frappe.utils import cint, fmt_money
 from frappe import throw, _
-from frappe.utils.nestedset import NestedSet
+from frappe.model.document import Document
 
 class RootNotEditable(frappe.ValidationError): pass
 class BalanceMismatchError(frappe.ValidationError): pass
 
-class Account(NestedSet):
+class Account(Document):
 	nsm_parent_field = 'parent_account'
 
 	def onload(self):
@@ -20,14 +20,18 @@ class Account(NestedSet):
 			self.set_onload("can_freeze_account", True)
 
 	def autoname(self):
-		self.name = get_account_autoname(self.account_number, self.account_name, self.company)
+		# first validate if company exists
+		company = frappe.db.get_value("Company", self.company, ["abbr", "name"], as_dict=True)
+		if not company:
+			frappe.throw(_('Company {0} does not exist').format(self.company))
+
+		self.name = self.account_name.strip() + ' - ' + company.abbr
 
 	def validate(self):
 		if frappe.local.flags.allow_unverified_charts:
 			return
 		self.validate_parent()
 		self.validate_root_details()
-		validate_account_number(self.name, self.account_number, self.company)
 		self.validate_group_or_ledger()
 		self.set_root_and_report_type()
 		self.validate_mandatory()
@@ -52,8 +56,7 @@ class Account(NestedSet):
 
 	def set_root_and_report_type(self):
 		if self.parent_account:
-			par = frappe.db.get_value("Account", self.parent_account,
-				["report_type", "root_type"], as_dict=1)
+			par = frappe.db.get_value("Account", self.parent_account, ["report_type", "root_type"], as_dict=1)
 
 			if par.report_type:
 				self.report_type = par.report_type
@@ -158,12 +161,56 @@ class Account(NestedSet):
 		if not self.report_type:
 			throw(_("Report Type is mandatory"))
 
-	def on_trash(self):
-		# checks gl entries and if child exists
+
+	def update_nsm_model(self):
+		"""update lft, rgt indices for nested set model"""
+		import frappe
+		import frappe.utils.nestedset
+		frappe.utils.nestedset.update_nsm(self)
+
+	def on_update(self):
+		self.update_nsm_model()
+
+	def validate_trash(self):
+		"""checks gl entries and if child exists"""
 		if self.check_gle_exists():
 			throw(_("Account with existing transaction can not be deleted"))
+		if self.check_if_child_exists():
+			throw(_("Child account exists for this account. You can not delete this account."))
 
-		super(Account, self).on_trash(True)
+	def on_trash(self):
+		self.validate_trash()
+		self.update_nsm_model()
+
+	def before_rename(self, old, new, merge=False):
+		# Add company abbr if not provided
+		from erpnext.setup.doctype.company.company import get_name_with_abbr
+		new_account = get_name_with_abbr(new, self.company)
+
+		# Validate properties before merging
+		if merge:
+			if not frappe.db.exists("Account", new):
+				throw(_("Account {0} does not exist").format(new))
+
+			val = list(frappe.db.get_value("Account", new_account,
+				["is_group", "root_type", "company"]))
+
+			if val != [self.is_group, self.root_type, self.company]:
+				throw(_("""Merging is only possible if following properties are same in both records. Is Group, Root Type, Company"""))
+
+			if self.is_group and frappe.db.get_value("Account", new, "parent_account") == old:
+				frappe.db.set_value("Account", new, "parent_account",
+					frappe.db.get_value("Account", old, "parent_account"))
+
+		return new_account
+
+	def after_rename(self, old, new, merge=False):
+		if not merge:
+			frappe.db.set_value("Account", new, "account_name",
+				" - ".join(new.split(" - ")[:-1]))
+		else:
+			from frappe.utils.nestedset import rebuild_tree
+			rebuild_tree("Account", "parent_account")
 
 def get_parent_account(doctype, txt, searchfield, start, page_len, filters):
 	return frappe.db.sql("""select name from tabAccount
@@ -184,59 +231,3 @@ def get_account_currency(account):
 		return account_currency
 
 	return frappe.local_cache("account_currency", account, generator)
-
-def get_account_autoname(account_number, account_name, company):
-	# first validate if company exists
-	company = frappe.db.get_value("Company", company, ["abbr", "name"], as_dict=True)
-	if not company:
-		frappe.throw(_('Company {0} does not exist').format(company))
-
-	parts = [account_name.strip(), company.abbr]
-	if cstr(account_number).strip():
-		parts.insert(0, cstr(account_number).strip())
-	return ' - '.join(parts)
-
-def validate_account_number(name, account_number, company):
-	if account_number:
-		account_with_same_number = frappe.db.get_value("Account",
-			{"account_number": account_number, "company": company, "name": ["!=", name]})
-		if account_with_same_number:
-			frappe.throw(_("Account Number {0} already used in account {1}")
-				.format(account_number, account_with_same_number))
-
-@frappe.whitelist()
-def update_account_number(name, account_name, account_number=None):
-
-	account = frappe.db.get_value("Account", name, "company", as_dict=True)
-	if not account: return
-	validate_account_number(name, account_number, account.company)
-	if account_number:
-		frappe.db.set_value("Account", name, "account_number", account_number.strip())
-	else:
-		frappe.db.set_value("Account", name, "account_number", "")
-	frappe.db.set_value("Account", name, "account_name", account_name.strip())
-
-	new_name = get_account_autoname(account_number, account_name, account.company)
-	if name != new_name:
-		frappe.rename_doc("Account", name, new_name, ignore_permissions=1)
-		return new_name
-
-@frappe.whitelist()
-def merge_account(old, new, is_group, root_type, company):
-	# Validate properties before merging
-	if not frappe.db.exists("Account", new):
-		throw(_("Account {0} does not exist").format(new))
-
-	val = list(frappe.db.get_value("Account", new,
-		["is_group", "root_type", "company"]))
-
-	if val != [cint(is_group), root_type, company]:
-		throw(_("""Merging is only possible if following properties are same in both records. Is Group, Root Type, Company"""))
-
-	if is_group and frappe.db.get_value("Account", new, "parent_account") == old:
-		frappe.db.set_value("Account", new, "parent_account",
-			frappe.db.get_value("Account", old, "parent_account"))
-
-	frappe.rename_doc("Account", old, new, merge=1, ignore_permissions=1)
-
-	return new

erpnext/accounts/doctype/account/account_tree.js

@@ -24,8 +24,6 @@ frappe.treeview_settings["Account"] = {
 	fields: [
 		{fieldtype:'Data', fieldname:'account_name', label:__('New Account Name'), reqd:true,
 			description: __("Name of new Account. Note: Please don't create accounts for Customers and Suppliers")},
-		{fieldtype:'Data', fieldname:'account_number', label:__('Account Number'),
-			description: __("Number of new Account, it will be included in the account name as a prefix")},
 		{fieldtype:'Check', fieldname:'is_group', label:__('Is Group'),
 			description: __('Further accounts can be made under Groups, but entries can be made against non-Groups')},
 		{fieldtype:'Select', fieldname:'root_type', label:__('Root Type'),
@@ -43,53 +41,16 @@ frappe.treeview_settings["Account"] = {
 			description: __("Optional. Sets company's default currency, if not specified.")}
 	],
 	ignore_fields:["parent_account"],
-	onload: function(treeview) {
-		function get_company() {
-			return treeview.page.fields_dict.company.get_value();
-		}
-
-		// tools
-		treeview.page.add_inner_button(__("Chart of Cost Centers"), function() {
-			frappe.set_route('Tree', 'Cost Center', {company: get_company()});
-		}, __('View'));
-
-		treeview.page.add_inner_button(__("Opening Invoice Creation Tool"), function() {
-			frappe.set_route('Form', 'Opening Invoice Creation Tool', {company: get_company()});
-		}, __('View'));
-
-		treeview.page.add_inner_button(__("Period Closing Voucher"), function() {
-			frappe.set_route('List', 'Period Closing Voucher', {company: get_company()});
-		}, __('View'));
-
-		// make
-		treeview.page.add_inner_button(__("Journal Entry"), function() {
-			frappe.new_doc('Journal Entry', {company: get_company()});
-		}, __('Make'));
-		treeview.page.add_inner_button(__("New Company"), function() {
-			frappe.new_doc('Company');
-		}, __('Make'));
-
-		// financial statements
-		for (let report of ['Trial Balance', 'General Ledger', 'Balance Sheet',
-			'Profit and Loss Statement', 'Cash Flow Statement', 'Accounts Payable', 'Accounts Receivable']) {
-			treeview.page.add_inner_button(__(report), function() {
-				frappe.set_route('query-report', report, {company: get_company()});
-			}, __('Financial Statements'));
-		}
-
-	},
 	onrender: function(node) {
-		if(frappe.boot.user.can_read.indexOf("GL Entry") !== -1){
-			var dr_or_cr = node.data.balance < 0 ? "Cr" : "Dr";
-			if (node.data && node.data.balance!==undefined) {
-				$('<span class="balance-area pull-right text-muted small">'
-					+ (node.data.balance_in_account_currency ?
-						(format_currency(Math.abs(node.data.balance_in_account_currency),
-							node.data.account_currency) + " / ") : "")
-					+ format_currency(Math.abs(node.data.balance), node.data.company_currency)
-					+ " " + dr_or_cr
-					+ '</span>').insertBefore(node.$ul);
-			}
+		var dr_or_cr = node.data.balance < 0 ? "Cr" : "Dr";
+		if (node.data && node.data.balance!==undefined) {
+			$('<span class="balance-area pull-right text-muted small">'
+				+ (node.data.balance_in_account_currency ?
+					(format_currency(Math.abs(node.data.balance_in_account_currency),
+						node.data.account_currency) + " / ") : "")
+				+ format_currency(Math.abs(node.data.balance), node.data.company_currency)
+				+ " " + dr_or_cr
+				+ '</span>').insertBefore(node.$ul);
 		}
 	},
 	toolbar: [

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

@@ -16,12 +16,12 @@ def create_charts(company, chart_template=None, existing_company=None):
 				if root_account:
 					root_type = child.get("root_type")
 
-				if account_name not in ["account_number", "account_type",
-					"root_type", "is_group", "tax_rate"]:
+				if account_name not in ["account_type", "root_type", "is_group", "tax_rate"]:
 
-					account_number = cstr(child.get("account_number")).strip()
-					account_name, account_name_in_db = add_suffix_if_duplicate(account_name,
-						account_number, accounts)
+					account_name_in_db = unidecode(account_name.strip().lower())
+					if account_name_in_db in accounts:
+						count = accounts.count(account_name_in_db)
+						account_name = account_name + " " + cstr(count)
 
 					is_group = identify_is_group(child)
 					report_type = "Balance Sheet" if root_type in ["Asset", "Liability", "Equity"] \
@@ -35,7 +35,6 @@ def create_charts(company, chart_template=None, existing_company=None):
 						"is_group": is_group,
 						"root_type": root_type,
 						"report_type": report_type,
-						"account_number": account_number,
 						"account_type": child.get("account_type"),
 						"account_currency": frappe.db.get_value("Company", company, "default_currency"),
 						"tax_rate": child.get("tax_rate")
@@ -54,23 +53,10 @@ def create_charts(company, chart_template=None, existing_company=None):
 
 		_import_accounts(chart, None, None, root_account=True)
 
-def add_suffix_if_duplicate(account_name, account_number, accounts):
-	if account_number:
-		account_name_in_db = unidecode(" - ".join([account_number,
-			account_name.strip().lower()]))
-	else:
-		account_name_in_db = unidecode(account_name.strip().lower())
-
-	if account_name_in_db in accounts:
-		count = accounts.count(account_name_in_db)
-		account_name = account_name + " " + cstr(count)
-
-	return account_name, account_name_in_db
-
 def identify_is_group(child):
 	if child.get("is_group"):
 		is_group = child.get("is_group")
-	elif len(set(child.keys()) - set(["account_type", "root_type", "is_group", "tax_rate", "account_number"])):
+	elif len(set(child.keys()) - set(["account_type", "root_type", "is_group", "tax_rate"])):
 		is_group = 1
 	else:
 		is_group = 0
@@ -85,10 +71,6 @@ def get_chart(chart_template, existing_company=None):
 	elif chart_template == "Standard":
 		from erpnext.accounts.doctype.account.chart_of_accounts.verified import standard_chart_of_accounts
 		return standard_chart_of_accounts.get()
-	elif chart_template == "Standard with Numbers":
-		from erpnext.accounts.doctype.account.chart_of_accounts.verified \
-			import standard_chart_of_accounts_with_account_number
-		return standard_chart_of_accounts_with_account_number.get()
 	else:
 		folders = ("verified",)
 		if frappe.local.flags.allow_unverified_charts:
@@ -104,7 +86,7 @@ def get_chart(chart_template, existing_company=None):
 							return json.loads(chart).get("tree")
 
 @frappe.whitelist()
-def get_charts_for_country(country, with_standard=False):
+def get_charts_for_country(country):
 	charts = []
 
 	def _get_chart_name(content):
@@ -129,26 +111,26 @@ def get_charts_for_country(country, with_standard=False):
 					with open(os.path.join(path, fname), "r") as f:
 						_get_chart_name(f.read())
 
-	if len(charts) != 1 or with_standard:
-		charts += ["Standard", "Standard with Numbers"]
+	if len(charts) != 1:
+		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", "account_number"],
+	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 ""
@@ -157,16 +139,17 @@ def build_account_tree(tree, parent, all_accounts):
 	# if no children, but a group account
 	if not children and parent.is_group:
 		tree["is_group"] = 1
-		tree["account_number"] = parent.account_number
 
 	# build a subtree for each child
 	for child in children:
+		if child.account_type == "Stock" and not child.is_group:
+			tree["is_group"] = 1
+			continue
+		
 		# start new subtree
 		tree[child.account_name] = {}
 		
 		# assign account_type and root_type
-		if child.account_number:
-			tree[child.account_name]["account_number"] = child.account_number
 		if child.account_type:
 			tree[child.account_name]["account_type"] = child.account_type
 		if child.tax_rate:
@@ -175,4 +158,4 @@ def build_account_tree(tree, parent, all_accounts):
 			tree[child.account_name]["root_type"] = child.root_type
 			
 		# call recursively to build a subtree for current account
-		build_account_tree(tree[child.account_name], child, all_accounts)
+		build_account_tree(tree[child.account_name], child, all_accounts)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -527,7 +527,7 @@
 			"root_type": "Liability"
 		}, 
 		"5. SZ\u00c1MLAOSZT\u00c1LY K\u00d6LTS\u00c9GNEMEK": {
-			"51 - 53. ANYAGJELLEG\u00db R\u00c1FORD\u00cdT\u00c1SOK ": {
+			"51 - 53 ANYAGJELLEG\u00db R\u00c1FORD\u00cdT\u00c1SOK ": {
 				"51. ANYAGK\u00d6LTS\u00c9G": {
 					"511. V\u00e1s\u00e1rolt anyagok k\u00f6lts\u00e9gei ": {
 						"5111. Alapanyag k\u00f6lts\u00e9gek": {}, 
@@ -588,6 +588,7 @@
 						"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": {}, 
@@ -617,8 +618,23 @@
 				"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 \u00c1TVEZET\u00c9SI SZ\u00c1MLA": {
+			}, 
+			"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"
@@ -730,7 +746,7 @@
 					"8684. K\u00f6vetel\u00e9sek \u00e9rt\u00e9kveszt\u00e9se": {}
 				}, 
 				"869. K\u00fcl\u00f6nf\u00e9le egy\u00e9b r\u00e1ford\u00edt\u00e1sok": {
-					"8691. T\u00e1rsas\u00e1gba bevitt, \u00e9rt\u00e9kpap\u00edrnak vagy r\u00e9szesed\u00e9snek nem min\u0151s\u00fcl\u0151 vagyont.": {}, 
+					"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": {}, 
@@ -812,7 +828,12 @@
 					"9684. R\u00e9szesed\u00e9sek \u00e9rt\u00e9kveszt\u00e9s\u00e9nek vissza\u00edr\u00e1sa": {}
 				}, 
 				"969. K\u00fcl\u00f6nf\u00e9le egy\u00e9b bev\u00e9telek": {
-					"is_group": 1
+					"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": {

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

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

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

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

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

erpnext/accounts/doctype/account/test_account.py

@@ -2,100 +2,9 @@
 # License: GNU General Public License v3. See license.txt
 
 from __future__ import unicode_literals
-import unittest
 import frappe
 from erpnext.stock import get_warehouse_account, get_company_default_inventory_account
-from erpnext.accounts.doctype.account.account import update_account_number
-from erpnext.accounts.doctype.account.account import merge_account
 
-class TestAccount(unittest.TestCase):
-	def test_rename_account(self):
-		if not frappe.db.exists("Account", "1210 - Debtors - _TC"):
-			acc = frappe.new_doc("Account")
-			acc.account_name = "Debtors"
-			acc.parent_account = "Accounts Receivable - _TC"
-			acc.account_number = "1210"
-			acc.company = "_Test Company"
-			acc.insert()
-
-		account_number, account_name = frappe.db.get_value("Account", "1210 - Debtors - _TC",
-			["account_number", "account_name"])
-		self.assertEqual(account_number, "1210")
-		self.assertEqual(account_name, "Debtors")
-
-		new_account_number = "1211-11-4 - 6 - "
-		new_account_name = "Debtors 1 - Test - "
-
-		update_account_number("1210 - Debtors - _TC", new_account_name, new_account_number)
-
-		new_acc = frappe.db.get_value("Account", "1211-11-4 - 6 - - Debtors 1 - Test - - _TC",
-			["account_name", "account_number"], as_dict=1)
-
-		self.assertEqual(new_acc.account_name, "Debtors 1 - Test -")
-		self.assertEqual(new_acc.account_number, "1211-11-4 - 6 -")
-
-		frappe.delete_doc("Account", "1211-11-4 - 6 - Debtors 1 - Test - - _TC")
-
-	def test_merge_account(self):
-		if not frappe.db.exists("Account", "Current Assets - _TC"):
-			acc = frappe.new_doc("Account")
-			acc.account_name = "Current Assets"
-			acc.is_group = 1
-			acc.parent_account = "Application of Funds (Assets) - _TC"
-			acc.company = "_Test Company"
-			acc.insert()
-		if not frappe.db.exists("Account", "Securities and Deposits - _TC"):
-			acc = frappe.new_doc("Account")
-			acc.account_name = "Securities and Deposits"
-			acc.parent_account = "Current Assets - _TC"
-			acc.is_group = 1
-			acc.company = "_Test Company"
-			acc.insert()
-		if not frappe.db.exists("Account", "Earnest Money - _TC"):
-			acc = frappe.new_doc("Account")
-			acc.account_name = "Earnest Money"
-			acc.parent_account = "Securities and Deposits - _TC"
-			acc.company = "_Test Company"
-			acc.insert()
-		if not frappe.db.exists("Account", "Cash In Hand - _TC"):
-			acc = frappe.new_doc("Account")
-			acc.account_name = "Cash In Hand"
-			acc.is_group = 1
-			acc.parent_account = "Current Assets - _TC"
-			acc.company = "_Test Company"
-			acc.insert()
-		if not frappe.db.exists("Account", "Accumulated Depreciation - _TC"):
-			acc = frappe.new_doc("Account")
-			acc.account_name = "Accumulated Depreciation"
-			acc.parent_account = "Fixed Assets - _TC"
-			acc.company = "_Test Company"
-			acc.insert()
-
-		doc = frappe.get_doc("Account", "Securities and Deposits - _TC")
-		parent = frappe.db.get_value("Account", "Earnest Money - _TC", "parent_account")
-
-		self.assertEqual(parent, "Securities and Deposits - _TC")
-
-		merge_account("Securities and Deposits - _TC", "Cash In Hand - _TC", doc.is_group, doc.root_type, doc.company)
-		parent = frappe.db.get_value("Account", "Earnest Money - _TC", "parent_account")
-
-		# Parent account of the child account changes after merging
-		self.assertEqual(parent, "Cash In Hand - _TC")
-
-		# Old account doesn't exist after merging
-		self.assertFalse(frappe.db.exists("Account", "Securities and Deposits - _TC"))
-
-		doc = frappe.get_doc("Account", "Current Assets - _TC")
-
-		# Raise error as is_group property doesn't match
-		self.assertRaises(frappe.ValidationError, merge_account, "Current Assets - _TC",\
-			"Accumulated Depreciation - _TC", doc.is_group, doc.root_type, doc.company)
-
-		doc = frappe.get_doc("Account", "Capital Stock - _TC")
-
-		# Raise error as root_type property doesn't match
-		self.assertRaises(frappe.ValidationError, merge_account, "Capital Stock - _TC",\
-			"Softwares - _TC", doc.is_group, doc.root_type, doc.company)
 
 def _make_test_records(verbose):
 	from frappe.test_runner import make_test_objects
@@ -112,7 +21,6 @@ def _make_test_records(verbose):
 		["_Test Account Customs Duty", "_Test Account Stock Expenses", 0, "Tax", None],
 		["_Test Account Insurance Charges", "_Test Account Stock Expenses", 0, "Chargeable", None],
 		["_Test Account Stock Adjustment", "_Test Account Stock Expenses", 0, "Stock Adjustment", None],
-		["_Test Employee Advance", "Current Liabilities", 0, None, None],
 
 		["_Test Account Tax Assets", "Current Assets", 1, None, None],
 		["_Test Account VAT", "_Test Account Tax Assets", 0, "Tax", None],

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

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

erpnext/accounts/doctype/accounts_settings/accounts_settings.json

@@ -286,218 +286,6 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "print_settings", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Print Settings", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "show_inclusive_tax_in_print", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Show Inclusive Tax In Print", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_12", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "show_payment_schedule_in_print", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Show Payment Schedule in Print", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "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, 
-   "set_only_once": 0, 
-   "unique": 0
   }
  ], 
  "has_web_view": 0, 
@@ -511,7 +299,7 @@
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-01-05 15:26:10.357085", 
+ "modified": "2017-06-16 17:39:50.614522", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Accounts Settings", 
@@ -536,46 +324,6 @@
    "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, 

erpnext/accounts/doctype/accounts_settings/accounts_settings.py

@@ -5,27 +5,10 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.utils import cint
+from frappe import _
+from frappe.utils import cint, comma_and
 from frappe.model.document import Document
-from frappe.custom.doctype.property_setter.property_setter import make_property_setter
-
 
 class AccountsSettings(Document):
 	def on_update(self):
-		pass
-
-	def validate(self):
-		self.validate_stale_days()
-		self.enable_payment_schedule_in_print()
-
-	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)
-
-	def enable_payment_schedule_in_print(self):
-		show_in_print = cint(self.show_payment_schedule_in_print)
-		for doctype in ("Sales Order", "Sales Invoice", "Purchase Order", "Purchase Invoice"):
-			make_property_setter(doctype, "due_date", "print_hide", show_in_print, "Check")
-			make_property_setter(doctype, "payment_schedule", "print_hide",  0 if show_in_print else 1, "Check")
+		pass

erpnext/accounts/doctype/accounts_settings/test_accounts_settings.js

@@ -1,35 +0,0 @@
-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

@@ -1,22 +0,0 @@
-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

@@ -23,14 +23,6 @@ frappe.ui.form.on('Asset', {
 				}
 			};
 		});
-
-		frm.set_query("cost_center", function() {
-			return {
-				"filters": {
-					"company": frm.doc.company,
-				}
-			};
-		});
 	},
 
 	refresh: function(frm) {
@@ -39,6 +31,11 @@ frappe.ui.form.on('Asset', {
 		frm.events.make_schedules_editable(frm);
 
 		if (frm.doc.docstatus==1) {
+			if (frm.doc.status=='Submitted' && !frm.doc.is_existing_asset && !frm.doc.purchase_invoice) {
+				frm.add_custom_button("Make Purchase Invoice", function() {
+					erpnext.asset.make_purchase_invoice(frm);
+				});
+			}
 			if (in_list(["Submitted", "Partially Depreciated", "Fully Depreciated"], frm.doc.status)) {
 				frm.add_custom_button("Transfer Asset", function() {
 					erpnext.asset.transfer_asset(frm);
@@ -49,7 +46,7 @@ frappe.ui.form.on('Asset', {
 				});
 
 				frm.add_custom_button("Sell Asset", function() {
-					frm.trigger("make_sales_invoice");
+					erpnext.asset.make_sales_invoice(frm);
 				});
 
 			} else if (frm.doc.status=='Scrapped') {
@@ -57,24 +54,14 @@ frappe.ui.form.on('Asset', {
 					erpnext.asset.restore_asset(frm);
 				});
 			}
-			if (frm.doc.status=='Submitted' && !frm.doc.is_existing_asset && !frm.doc.purchase_invoice) {
-				frm.add_custom_button(__("Purchase Invoice"), function() {
-					frm.trigger("make_purchase_invoice");
-				}, __("Make"));
-			}
-			if (frm.doc.maintenance_required && !frm.doc.maintenance_schedule) {
-				frm.add_custom_button(__("Asset Maintenance"), function() {
-					frm.trigger("create_asset_maintenance");
-				}, __("Make"));
-			}
-			frm.page.set_inner_btn_group_as_primary(__("Make"));
-			frm.trigger("setup_chart");
+
+			frm.trigger("show_graph");
 		}
 	},
 
-	setup_chart: function(frm) {
-		var x_intervals = [frm.doc.purchase_date];
-		var asset_values = [frm.doc.gross_purchase_amount];
+	show_graph: function(frm) {
+		var x_intervals = ["x", frm.doc.purchase_date];
+		var asset_values = ["Asset Value", frm.doc.gross_purchase_amount];
 		var last_depreciation_date = frm.doc.purchase_date;
 
 		if(frm.doc.opening_accumulated_depreciation) {
@@ -91,15 +78,15 @@ frappe.ui.form.on('Asset', {
 			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);
+				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);
@@ -107,25 +94,36 @@ frappe.ui.form.on('Asset', {
 			last_depreciation_date = frm.doc.disposal_date;
 		}
 
-		frm.dashboard.render_graph({
-			title: "Asset Value",
+		frm.dashboard.setup_chart({
 			data: {
-				labels: x_intervals,
-				datasets: [{
-					color: 'green',
-					values: asset_values,
-					formatted: asset_values.map(d => d.toFixed(2))
-				}]
+				x: 'x',
+				columns: [x_intervals, asset_values],
+				regions: {
+					'Asset Value': [{'start': last_depreciation_date, 'style':'dashed'}]
+				}
 			},
-			type: 'line'
+			legend: {
+				show: false
+			},
+			axis: {
+				x: {
+					type: 'timeseries',
+					tick: {
+						format: "%d-%m-%Y"
+					}
+				},
+				y: {
+					min: 0,
+					padding: {bottom: 10}
+				}
+			}
 		});
 	},
 
-
 	item_code: function(frm) {
 		if(frm.doc.item_code) {
 			frappe.call({
-				method: "erpnext.assets.doctype.asset.asset.get_item_details",
+				method: "erpnext.accounts.doctype.asset.asset.get_item_details",
 				args: {
 					item_code: frm.doc.item_code
 				},
@@ -141,7 +139,8 @@ frappe.ui.form.on('Asset', {
 	},
 
 	is_existing_asset: function(frm) {
-		frm.toggle_reqd("next_depreciation_date", (!frm.doc.is_existing_asset && frm.doc.calculate_depreciation));
+		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) {
@@ -157,56 +156,8 @@ frappe.ui.form.on('Asset', {
 		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);
-	},
-
-	make_purchase_invoice: function(frm) {
-		frappe.call({
-			args: {
-				"asset": frm.doc.name,
-				"item_code": frm.doc.item_code,
-				"gross_purchase_amount": frm.doc.gross_purchase_amount,
-				"company": frm.doc.company,
-				"posting_date": frm.doc.purchase_date
-			},
-			method: "erpnext.assets.doctype.asset.asset.make_purchase_invoice",
-			callback: function(r) {
-				var doclist = frappe.model.sync(r.message);
-				frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
-			}
-		})
-	},
-
-	make_sales_invoice: function(frm) {
-		frappe.call({
-			args: {
-				"asset": frm.doc.name,
-				"item_code": frm.doc.item_code,
-				"company": frm.doc.company
-			},
-			method: "erpnext.assets.doctype.asset.asset.make_sales_invoice",
-			callback: function(r) {
-				var doclist = frappe.model.sync(r.message);
-				frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
-			}
-		})
-	},
-
-	create_asset_maintenance: function(frm) {
-		frappe.call({
-			args: {
-				"asset": frm.doc.name,
-				"item_code": frm.doc.item_code,
-				"item_name": frm.doc.item_name,
-				"asset_category": frm.doc.asset_category,
-				"company": frm.doc.company
-			},
-			method: "erpnext.assets.doctype.asset.asset.create_asset_maintenance",
-			callback: function(r) {
-				var doclist = frappe.model.sync(r.message);
-				frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
-			}
-		})
 	}
+
 });
 
 frappe.ui.form.on('Depreciation Schedule', {
@@ -214,7 +165,7 @@ frappe.ui.form.on('Depreciation Schedule', {
 		var row = locals[cdt][cdn];
 		if (!row.journal_entry) {
 			frappe.call({
-				method: "erpnext.assets.doctype.asset.depreciation.make_depreciation_entry",
+				method: "erpnext.accounts.doctype.asset.depreciation.make_depreciation_entry",
 				args: {
 					"asset_name": frm.doc.name,
 					"date": row.schedule_date
@@ -242,7 +193,39 @@ erpnext.asset.set_accululated_depreciation = function(frm) {
 		frappe.model.set_value(row.doctype, row.name,
 			"accumulated_depreciation_amount", accumulated_depreciation);
 	})
-};
+}
+
+erpnext.asset.make_purchase_invoice = function(frm) {
+	frappe.call({
+		args: {
+			"asset": frm.doc.name,
+			"item_code": frm.doc.item_code,
+			"gross_purchase_amount": frm.doc.gross_purchase_amount,
+			"company": frm.doc.company,
+			"posting_date": frm.doc.purchase_date
+		},
+		method: "erpnext.accounts.doctype.asset.asset.make_purchase_invoice",
+		callback: function(r) {
+			var doclist = frappe.model.sync(r.message);
+			frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
+		}
+	})
+}
+
+erpnext.asset.make_sales_invoice = function(frm) {
+	frappe.call({
+		args: {
+			"asset": frm.doc.name,
+			"item_code": frm.doc.item_code,
+			"company": frm.doc.company
+		},
+		method: "erpnext.accounts.doctype.asset.asset.make_sales_invoice",
+		callback: function(r) {
+			var doclist = frappe.model.sync(r.message);
+			frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
+		}
+	})
+}
 
 erpnext.asset.scrap_asset = function(frm) {
 	frappe.confirm(__("Do you really want to scrap this asset?"), function () {
@@ -250,13 +233,13 @@ erpnext.asset.scrap_asset = function(frm) {
 			args: {
 				"asset_name": frm.doc.name
 			},
-			method: "erpnext.assets.doctype.asset.depreciation.scrap_asset",
+			method: "erpnext.accounts.doctype.asset.depreciation.scrap_asset",
 			callback: function(r) {
 				cur_frm.reload_doc();
 			}
 		})
 	})
-};
+}
 
 erpnext.asset.restore_asset = function(frm) {
 	frappe.confirm(__("Do you really want to restore this scrapped asset?"), function () {
@@ -264,13 +247,13 @@ erpnext.asset.restore_asset = function(frm) {
 			args: {
 				"asset_name": frm.doc.name
 			},
-			method: "erpnext.assets.doctype.asset.depreciation.restore_asset",
+			method: "erpnext.accounts.doctype.asset.depreciation.restore_asset",
 			callback: function(r) {
 				cur_frm.reload_doc();
 			}
 		})
 	})
-};
+}
 
 erpnext.asset.transfer_asset = function(frm) {
 	var dialog = new frappe.ui.Dialog({
@@ -307,7 +290,7 @@ erpnext.asset.transfer_asset = function(frm) {
 		dialog.hide();
 		return frappe.call({
 			type: "GET",
-			method: "erpnext.assets.doctype.asset.asset.transfer_asset",
+			method: "erpnext.accounts.doctype.asset.asset.transfer_asset",
 			args: {
 				args: {
 					"asset": frm.doc.name,
@@ -324,4 +307,4 @@ erpnext.asset.transfer_asset = function(frm) {
 		})
 	});
 	dialog.show();
-};
+}

erpnext/accounts/doctype/asset/asset.py

@@ -5,10 +5,10 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
-from frappe.utils import flt, add_months, cint, nowdate, getdate, today
+from frappe.utils import flt, add_months, cint, nowdate, getdate
 from frappe.model.document import Document
 from erpnext.accounts.doctype.purchase_invoice.purchase_invoice import get_fixed_asset_account
-from erpnext.assets.doctype.asset.depreciation \
+from erpnext.accounts.doctype.asset.depreciation \
 	import get_disposal_account_and_cost_center, get_depreciation_accounts
 
 class Asset(Document):
@@ -17,12 +17,12 @@ class Asset(Document):
 		self.validate_item()
 		self.set_missing_values()
 		self.validate_asset_values()
-		if self.calculate_depreciation:
-			self.make_depreciation_schedule()
-			self.set_accumulated_depreciation()
-			get_depreciation_accounts(self)
+		self.make_depreciation_schedule()
+		self.set_accumulated_depreciation()
 		if self.get("schedules"):
 			self.validate_expected_value_after_useful_life()
+		# Validate depreciation related accounts
+		get_depreciation_accounts(self)
 
 	def on_submit(self):
 		self.set_status()
@@ -51,6 +51,9 @@ class Asset(Document):
 				if not self.get(field):
 					self.set(field, value)
 
+		self.value_after_depreciation = (flt(self.gross_purchase_amount) -
+			flt(self.opening_accumulated_depreciation))
+
 	def validate_asset_values(self):
 		if flt(self.expected_value_after_useful_life) >= flt(self.gross_purchase_amount):
 			frappe.throw(_("Expected Value After Useful Life must be less than Gross Purchase Amount"))
@@ -58,9 +61,6 @@ class Asset(Document):
 		if not flt(self.gross_purchase_amount):
 			frappe.throw(_("Gross Purchase Amount is mandatory"), frappe.MandatoryError)
 
-		if not self.calculate_depreciation:
-			return
-
 		if not self.is_existing_asset:
 			self.opening_accumulated_depreciation = 0
 			self.number_of_depreciations_booked = 0
@@ -81,9 +81,6 @@ class Asset(Document):
 			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"))
 
-		self.value_after_depreciation = (flt(self.gross_purchase_amount) -
-			flt(self.opening_accumulated_depreciation))
-
 		if self.next_depreciation_date and getdate(self.next_depreciation_date) < getdate(nowdate()):
 			frappe.msgprint(_("Next Depreciation Date is entered as past date"), title=_('Warning'), indicator='red')
 
@@ -91,7 +88,7 @@ class Asset(Document):
 			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 and self.calculate_depreciation):
+			and not self.next_depreciation_date):
 				frappe.throw(_("Please set Next Depreciation Date"))
 
 	def make_depreciation_schedule(self):
@@ -109,13 +106,12 @@ class Asset(Document):
 						n * cint(self.frequency_of_depreciation))
 
 					depreciation_amount = self.get_depreciation_amount(value_after_depreciation)
-					if depreciation_amount:
-						value_after_depreciation -= flt(depreciation_amount)
+					value_after_depreciation -= flt(depreciation_amount)
 
-						self.append("schedules", {
-							"schedule_date": schedule_date,
-							"depreciation_amount": depreciation_amount
-						})
+					self.append("schedules", {
+						"schedule_date": schedule_date,
+						"depreciation_amount": depreciation_amount
+					})
 
 	def set_accumulated_depreciation(self):
 		accumulated_depreciation = flt(self.opening_accumulated_depreciation)
@@ -178,7 +174,7 @@ class Asset(Document):
 	def set_status(self, status=None):
 		'''Get and update status'''
 		if not status:
-			status = self.get_status()	
+			status = self.get_status()
 		self.db_set("status", status)
 
 	def get_status(self):
@@ -195,18 +191,9 @@ class Asset(Document):
 				status = 'Partially Depreciated'
 		elif self.docstatus == 2:
 			status = "Cancelled"
+
 		return status
 
-def update_maintenance_status():
-	assets = frappe.get_all('Asset', filters = {'docstatus': 1, 'maintenance_required': 1})
-
-	for asset in assets:
-		asset = frappe.get_doc("Asset", asset.name)
-		if frappe.db.exists('Asset Maintenance Task', {'parent': asset.name, 'next_due_date': today()}):
-			asset.set_status('In Maintenance')
-		if frappe.db.exists('Asset Repair', {'asset_name': asset.name, 'repair_status': 'Pending'}):
-			asset.set_status('Out of Order')
-
 @frappe.whitelist()
 def make_purchase_invoice(asset, item_code, gross_purchase_amount, company, posting_date):
 	pi = frappe.new_doc("Purchase Invoice")
@@ -243,18 +230,6 @@ def make_sales_invoice(asset, item_code, company):
 	si.set_missing_values()
 	return si
 
-@frappe.whitelist()
-def create_asset_maintenance(asset, item_code, item_name, asset_category, company):
-	asset_maintenance = frappe.new_doc("Asset Maintenance")
-	asset_maintenance.update({
-		"asset_name": asset,
-		"company": company,
-		"item_code": item_code,
-		"item_name": item_name,
-		"asset_category": asset_category
-	})
-	return asset_maintenance
-
 @frappe.whitelist()
 def transfer_asset(args):
 	import json

erpnext/accounts/doctype/asset/depreciation.py

@@ -38,7 +38,7 @@ def make_depreciation_entry(asset_name, date=None):
 
 	depreciation_cost_center, depreciation_series = frappe.db.get_value("Company", asset.company,
 		["depreciation_cost_center", "series_for_depreciation_entry"])
-	depreciation_cost_center = asset.cost_center or depreciation_cost_center
+	
 
 	for d in asset.get("schedules"):
 		if not d.journal_entry and getdate(d.schedule_date) <= getdate(date):
@@ -154,8 +154,6 @@ def restore_asset(asset_name):
 def get_gl_entries_on_asset_disposal(asset, selling_amount=0):
 	fixed_asset_account, accumulated_depr_account, depr_expense_account = get_depreciation_accounts(asset)
 	disposal_account, depreciation_cost_center = get_disposal_account_and_cost_center(asset.company)
-	depreciation_cost_center = asset.cost_center or depreciation_cost_center
-
 	accumulated_depr_amount = flt(asset.gross_purchase_amount) - flt(asset.value_after_depreciation)
 
 	gl_entries = [
@@ -172,7 +170,7 @@ def get_gl_entries_on_asset_disposal(asset, selling_amount=0):
 	]
 
 	profit_amount = flt(selling_amount) - flt(asset.value_after_depreciation)
-	if profit_amount:
+	if flt(asset.value_after_depreciation) and profit_amount:
 		debit_or_credit = "debit" if profit_amount < 0 else "credit"
 		gl_entries.append({
 			"account": disposal_account,

erpnext/accounts/doctype/asset/test_asset.py

@@ -6,20 +6,19 @@ from __future__ import unicode_literals
 import frappe
 import unittest
 from frappe.utils import cstr, nowdate, getdate, flt
-from erpnext.assets.doctype.asset.depreciation import post_depreciation_entries, scrap_asset, restore_asset
-from erpnext.assets.doctype.asset.asset import make_sales_invoice, make_purchase_invoice
+from erpnext.accounts.doctype.asset.depreciation import post_depreciation_entries, scrap_asset, restore_asset
+from erpnext.accounts.doctype.asset.asset import make_sales_invoice, make_purchase_invoice
 
 class TestAsset(unittest.TestCase):
 	def setUp(self):
 		set_depreciation_settings_in_company()
 		create_asset()
-		frappe.db.sql("delete from `tabTax Rule`")
-
+		
 	def test_purchase_asset(self):
 		asset = frappe.get_doc("Asset", "Macbook Pro 1")
 		asset.submit()
 		
-		pi = make_purchase_invoice(asset.name, asset.item_code, asset.gross_purchase_amount,
+		pi = make_purchase_invoice(asset.name, asset.item_code, asset.gross_purchase_amount, 
 			asset.company, asset.purchase_date)
 		pi.supplier = "_Test Supplier"
 		pi.insert()
@@ -47,7 +46,7 @@ class TestAsset(unittest.TestCase):
 		self.assertEqual(asset.supplier, None)
 		self.assertEqual(asset.purchase_invoice, None)
 		
-		self.assertFalse(frappe.db.get_value("GL Entry",
+		self.assertFalse(frappe.db.get_value("GL Entry", 
 			{"voucher_type": "Purchase Invoice", "voucher_no": pi.name}))
 		
 
@@ -246,7 +245,6 @@ class TestAsset(unittest.TestCase):
 		self.assertEqual(gle, expected_gle)
 
 		si.cancel()
-		frappe.delete_doc("Sales Invoice", si.name)
 
 		self.assertEqual(frappe.db.get_value("Asset", "Macbook Pro 1", "status"), "Partially Depreciated")
 
@@ -291,12 +289,10 @@ def create_asset():
 		"item_code": "Macbook Pro",
 		"company": "_Test Company",
 		"purchase_date": "2015-01-01",
-		"calculate_depreciation": 1,
 		"next_depreciation_date": "2020-12-31",
 		"gross_purchase_amount": 100000,
 		"expected_value_after_useful_life": 10000,
-		"warehouse": "_Test Warehouse - _TC",
-		"asset_owner": "Company"
+		"warehouse": "_Test Warehouse - _TC"
 	})
 	try:
 		asset.save()
@@ -330,7 +326,7 @@ def create_fixed_asset_item():
 			"stock_uom": "Nos",
 			"is_stock_item": 0,
 			"is_fixed_asset": 1
-		}).insert()
+		}).insert()		
 	except frappe.DuplicateEntryError:
 		pass
 

erpnext/accounts/doctype/asset_category/asset_category.js

@@ -22,7 +22,7 @@ frappe.ui.form.on('Asset Category', {
 			var d  = locals[cdt][cdn];
 			return {
 				"filters": {
-					"account_type": "Accumulated Depreciation",
+					"root_type": "Asset",
 					"is_group": 0,
 					"company": d.company_name
 				}
@@ -41,4 +41,4 @@ frappe.ui.form.on('Asset Category', {
 		});
 
 	}
-});
+});

erpnext/accounts/doctype/asset_category/asset_category.json

@@ -1,6 +1,5 @@
 {
  "allow_copy": 0, 
- "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:asset_category_name", 
@@ -14,7 +13,6 @@
  "engine": "InnoDB", 
  "fields": [
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -26,7 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_global_search": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Asset Category Name", 
    "length": 0, 
@@ -44,7 +42,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -57,12 +54,12 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_global_search": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Depreciation Method", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "\nStraight Line\nDouble Declining Balance\nManual", 
+   "options": "\nStraight Line\nDouble Declining Balance", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -76,7 +73,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -105,7 +101,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -117,7 +112,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_global_search": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Total Number of Depreciations", 
    "length": 0, 
@@ -135,7 +130,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -147,7 +141,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_global_search": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Frequency of Depreciation (Months)", 
    "length": 0, 
@@ -165,7 +159,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -195,7 +188,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -226,19 +218,19 @@
    "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": 0, 
  "max_attachments": 0, 
- "modified": "2017-12-01 15:14:25.645077", 
+ "modified": "2017-02-17 16:09:52.955332", 
  "modified_by": "Administrator", 
- "module": "Assets", 
+ "module": "Accounts", 
  "name": "Asset Category", 
  "name_case": "", 
  "owner": "Administrator", 
@@ -282,26 +274,6 @@
    "share": 1, 
    "submit": 0, 
    "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Quality Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
   }
  ], 
  "quick_entry": 0, 
@@ -312,4 +284,4 @@
  "sort_order": "DESC", 
  "track_changes": 0, 
  "track_seen": 0
-}
+}

erpnext/accounts/doctype/asset_category_account/asset_category_account.json

@@ -1,6 +1,5 @@
 {
  "allow_copy": 0, 
- "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "beta": 0, 
@@ -10,10 +9,8 @@
  "doctype": "DocType", 
  "document_type": "", 
  "editable_grid": 1, 
- "engine": "InnoDB", 
  "fields": [
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -24,9 +21,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_global_search": 0, 
    "in_list_view": 1, 
-   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -44,7 +39,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -55,9 +49,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_global_search": 0, 
    "in_list_view": 1, 
-   "in_standard_filter": 0, 
    "label": "Fixed Asset Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -75,7 +67,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -86,9 +77,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_global_search": 0, 
    "in_list_view": 1, 
-   "in_standard_filter": 0, 
    "label": "Accumulated Depreciation Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -106,7 +95,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -117,9 +105,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_global_search": 0, 
    "in_list_view": 1, 
-   "in_standard_filter": 0, 
    "label": "Depreciation Expense Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -137,19 +123,19 @@
    "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": "2017-11-28 16:54:12.252271", 
+ "modified": "2016-11-03 15:12:55.775239", 
  "modified_by": "Administrator", 
- "module": "Assets", 
+ "module": "Accounts", 
  "name": "Asset Category Account", 
  "name_case": "", 
  "owner": "Administrator", 
@@ -157,9 +143,7 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
- "track_changes": 1, 
  "track_seen": 0
 }

erpnext/accounts/doctype/asset_movement/asset_movement.json

@@ -1,6 +1,5 @@
 {
  "allow_copy": 0, 
- "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "AM-.#####", 
@@ -13,7 +12,6 @@
  "editable_grid": 0, 
  "fields": [
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -25,7 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_global_search": 1, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Asset", 
    "length": 0, 
@@ -44,7 +42,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -56,7 +53,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_global_search": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Transaction Date", 
    "length": 0, 
@@ -74,7 +71,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -86,7 +82,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_global_search": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
@@ -105,7 +101,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -134,7 +129,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -165,7 +159,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -177,7 +170,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_global_search": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Target Warehouse", 
    "length": 0, 
@@ -196,7 +189,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -226,19 +218,19 @@
    "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": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-10-19 16:08:17.389257", 
+ "modified": "2017-02-17 16:09:32.069344", 
  "modified_by": "Administrator", 
- "module": "Assets", 
+ "module": "Accounts", 
  "name": "Asset Movement", 
  "name_case": "", 
  "owner": "Administrator", 

erpnext/accounts/doctype/asset_movement/test_asset_movement.py

@@ -6,7 +6,7 @@ from __future__ import unicode_literals
 import frappe
 from frappe.utils import now
 import unittest
-from erpnext.assets.doctype.asset.test_asset import create_asset
+from erpnext.accounts.doctype.asset.test_asset import create_asset
 
 
 class TestAssetMovement(unittest.TestCase):

erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json

@@ -159,36 +159,6 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "include_pos_transactions", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Include POS Transactions", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
   {
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
@@ -322,7 +292,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2018-03-07 18:58:48.658687", 
+ "modified": "2017-04-21 16:58:26.902732", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Bank Reconciliation", 

erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py

@@ -53,26 +53,10 @@ class BankReconciliation(Document):
 				posting_date ASC, name DESC
 		""".format(condition), 
 		        {"account":self.bank_account, "from":self.from_date, "to":self.to_date}, as_dict=1)
-
-		pos_entries = []
-		if self.include_pos_transactions:
-			pos_entries = frappe.db.sql("""
-				select
-					"Sales Invoice Payment" as payment_document, sip.name as payment_entry, sip.amount as debit,
-					si.posting_date, si.debit_to as against_account, sip.clearance_date,
-					account.account_currency, 0 as credit
-				from `tabSales Invoice Payment` sip, `tabSales Invoice` si, `tabAccount` account
-				where
-					sip.account=%(account)s and si.docstatus=1 and sip.parent = si.name
-					and account.name = sip.account and si.posting_date >= %(from)s and si.posting_date <= %(to)s {0}
-				order by
-					si.posting_date ASC, si.name DESC
-			""".format(condition),
-			        {"account":self.bank_account, "from":self.from_date, "to":self.to_date}, as_dict=1)
-
-		entries = sorted(list(payment_entries)+list(journal_entries+list(pos_entries)),
+		
+		entries = sorted(list(payment_entries)+list(journal_entries), 
 			key=lambda k: k['posting_date'] or getdate(nowdate()))
-
+				
 		self.set('payment_entries', [])
 		self.total_amount = 0.0
 

erpnext/accounts/doctype/bank_reconciliation/test_bank_reconciliation.py

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

erpnext/accounts/doctype/budget/budget.py

@@ -27,21 +27,13 @@ class Budget(Document):
 	def validate_duplicate(self):
 		budget_against_field = frappe.scrub(self.budget_against)
 		budget_against = self.get(budget_against_field)
-
-		accounts = [d.account for d in self.accounts] or []
-		existing_budget = frappe.db.sql("""
-			select
-				b.name, ba.account from `tabBudget` b, `tabBudget Account` ba
-			where
-				ba.parent = b.name and b.docstatus < 2 and b.company = %s and %s=%s and
-				b.fiscal_year=%s and b.name != %sand ba.account in (%s) """
-				% ('%s', budget_against_field, '%s', '%s', '%s', ','.join(['%s'] * len(accounts))),
-			(self.company, budget_against, self.fiscal_year, self.name) + tuple(accounts), as_dict=1)
-
-		for d in existing_budget:
-			frappe.throw(_("Another Budget record '{0}' already exists against {1} '{2}' and account '{3}' for fiscal year {4}")
-				.format(d.name, self.budget_against, budget_against, d.account, self.fiscal_year), DuplicateBudgetError)
-
+		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} '{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'):

erpnext/accounts/doctype/c_form/c_form.json

@@ -11,6 +11,36 @@
  "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, 
+   "print_hide": 0, 
+   "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, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "50%"
+  }, 
   {
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
@@ -408,7 +438,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 3, 
- "modified": "2017-11-10 18:44:44.081464", 
+ "modified": "2017-06-13 14:28:56.667292", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "C-Form", 

erpnext/accounts/doctype/cheque_print_template/cheque_print_template.py

@@ -27,32 +27,22 @@ def create_or_update_cheque_print_format(template_name):
 	doc = frappe.get_doc("Cheque Print Template", template_name)
 	
 	cheque_print.html = """
-<style>
-	.print-format {
-		padding: 0px;
-	}
-	@media screen {
-		.print-format {
-			padding: 0in;
-		}
-	}
-</style>
 <div style="position: relative; top:%(starting_position_from_top_edge)scm">
 	<div style="width:%(cheque_width)scm;height:%(cheque_height)scm;">
-		<span style="top:%(acc_pay_dist_from_top_edge)scm; left:%(acc_pay_dist_from_left_edge)scm;
-			border-bottom: solid 1px;border-top:solid 1px; width:2cm;text-align: center; position: absolute;">
+		<span style="top: {{ %(acc_pay_dist_from_top_edge)s }}cm; left: {{ %(acc_pay_dist_from_left_edge)s }}cm;
+			border-bottom: solid 1px;border-top:solid 1px; position: absolute;">
 				%(message_to_show)s
 		</span>
-		<span style="top:%(date_dist_from_top_edge)scm; left:%(date_dist_from_left_edge)scm;
+		<span style="top:%(date_dist_from_top_edge)s cm; left:%(date_dist_from_left_edge)scm;
 			position: absolute;">
 			{{ 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;  min-width: 6cm;">
+			position: absolute;">
 			{{ doc.account_no or '' }}
 		</span>
 		<span style="top:%(payer_name_from_top_edge)scm;left: %(payer_name_from_left_edge)scm;
-			position: absolute;  min-width: 6cm;">
+			position: absolute;">
 			{{doc.party_name}}
 		</span>
 		<span style="top:%(amt_in_words_from_top_edge)scm; left:%(amt_in_words_from_left_edge)scm;
@@ -61,11 +51,11 @@ def create_or_update_cheque_print_format(template_name):
 				{{frappe.utils.money_in_words(doc.base_paid_amount or doc.base_received_amount)}}
 		</span>
 		<span style="top:%(amt_in_figures_from_top_edge)scm;left: %(amt_in_figures_from_left_edge)scm;
-			position: absolute; min-width: 4cm;">
+			position: absolute;">
 			{{doc.get_formatted("base_paid_amount") or doc.get_formatted("base_received_amount")}}
 		</span>
 		<span style="top:%(signatory_from_top_edge)scm;left: %(signatory_from_left_edge)scm;
-			position: absolute;  min-width: 6cm;">
+			position: absolute;">
 			{{doc.company}}
 		</span>
 	</div>

erpnext/accounts/doctype/cost_center/cost_center.py

@@ -59,8 +59,9 @@ class CostCenter(NestedSet):
 		return new_cost_center
 
 	def after_rename(self, olddn, newdn, merge=False):
-		super(CostCenter, self).after_rename(olddn, newdn, merge)
-
 		if not merge:
 			frappe.db.set_value("Cost Center", newdn, "cost_center_name",
 				" - ".join(newdn.split(" - ")[:-1]))
+		else:
+			super(CostCenter, self).after_rename(olddn, newdn, merge)
+

erpnext/accounts/doctype/cost_center/cost_center_tree.js

@@ -23,35 +23,5 @@ frappe.treeview_settings["Cost Center"] = {
 		{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"],
-	onload: function(treeview) {
-		function get_company() {
-			return treeview.page.fields_dict.company.get_value();
-		}
-
-		// tools
-		treeview.page.add_inner_button(__("Chart of Accounts"), function() {
-			frappe.set_route('Tree', 'Account', {company: get_company()});
-		}, __('View'));
-
-		// make
-		treeview.page.add_inner_button(__("Budget List"), function() {
-			frappe.set_route('List', 'Budget', {company: get_company()});
-		}, __('Budget'));
-
-		treeview.page.add_inner_button(__("Monthly Distribution"), function() {
-			frappe.set_route('List', 'Monthly Distribution', {company: get_company()});
-		}, __('Budget'));
-
-		treeview.page.add_inner_button(__("Budget Variance Report"), function() {
-			frappe.set_route('query-report', 'Budget Variance Report', {company: get_company()});
-		}, __('Budget'));
-
-	},
-	onrender: function(node) {
-		if(node.is_root){
-			node.hide_add = true;
-		}
-	}
-
+	ignore_fields:["parent_cost_center"]
 }

erpnext/accounts/doctype/depreciation_schedule/depreciation_schedule.json

@@ -1,6 +1,5 @@
 {
  "allow_copy": 0, 
- "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 1, 
  "autoname": "", 
@@ -14,7 +13,6 @@
  "engine": "InnoDB", 
  "fields": [
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -25,9 +23,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_global_search": 0, 
    "in_list_view": 1, 
-   "in_standard_filter": 0, 
    "label": "Schedule Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -44,7 +40,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -55,9 +50,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_global_search": 0, 
    "in_list_view": 1, 
-   "in_standard_filter": 0, 
    "label": "Depreciation Amount", 
    "length": 0, 
    "no_copy": 1, 
@@ -75,7 +68,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -86,9 +78,7 @@
    "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,7 +94,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -115,9 +104,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_global_search": 0, 
    "in_list_view": 1, 
-   "in_standard_filter": 0, 
    "label": "Accumulated Depreciation Amount", 
    "length": 0, 
    "no_copy": 1, 
@@ -135,7 +122,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -147,9 +133,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_global_search": 0, 
    "in_list_view": 1, 
-   "in_standard_filter": 0, 
    "label": "Journal Entry", 
    "length": 0, 
    "no_copy": 1, 
@@ -167,7 +151,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -179,9 +162,7 @@
    "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 Depreciation Entry", 
    "length": 0, 
    "no_copy": 0, 
@@ -198,19 +179,19 @@
    "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": "2017-10-19 16:30:13.738170", 
+ "modified": "2016-11-18 16:42:19.543657", 
  "modified_by": "Administrator", 
- "module": "Assets", 
+ "module": "Accounts", 
  "name": "Depreciation Schedule", 
  "name_case": "", 
  "owner": "Administrator", 
@@ -218,9 +199,7 @@
  "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/depreciation_schedule/depreciation_schedule.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
 from __future__ import unicode_literals

erpnext/accounts/doctype/gl_entry/gl_entry.json

@@ -132,7 +132,7 @@
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
-   "search_index": 1, 
+   "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
   }, 
@@ -702,7 +702,7 @@
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
-   "search_index": 1, 
+   "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
   }
@@ -718,7 +718,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-08-10 16:16:53.019380", 
+ "modified": "2017-08-03 12:40:09.611951", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "GL Entry", 

erpnext/accounts/doctype/gst_account/gst_account.json

@@ -1,196 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2018-01-02 15:48:58.768352", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "cgst_account", 
-   "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": "CGST 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": "sgst_account", 
-   "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": "SGST 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": "igst_account", 
-   "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": "IGST 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": "cess_account", 
-   "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": "CESS Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2018-01-02 15:52:22.335988", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "GST Account", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
-}

erpnext/accounts/doctype/gst_account/gst_account.py

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

erpnext/accounts/doctype/journal_entry/journal_entry.js

@@ -82,8 +82,8 @@ erpnext.accounts.JournalEntry = frappe.ui.form.Controller.extend({
 			$.each(this.frm.doc.accounts || [], function(i, jvd) {
 				frappe.model.set_default_values(jvd);
 			});
-			var posting_date = this.frm.posting_date;
-			if(!this.frm.doc.amended_from) this.frm.set_value('posting_date', posting_date || frappe.datetime.get_today());
+
+			if(!this.frm.doc.amended_from) this.frm.doc.posting_date = this.frm.posting_date || frappe.datetime.get_today();
 		}
 	},
 
@@ -124,15 +124,6 @@ erpnext.accounts.JournalEntry = frappe.ui.form.Controller.extend({
 				};
 			}
 
-			if(jvd.reference_type==="Employee Advance") {
-				return {
-					filters: {
-						'status': ['=', 'Unpaid'],
-						'docstatus': 1
-					}
-				};
-			}
-
 			// journal entry
 			if(jvd.reference_type==="Journal Entry") {
 				frappe.model.validate_missing(jvd, "account");
@@ -196,19 +187,20 @@ erpnext.accounts.JournalEntry = frappe.ui.form.Controller.extend({
 
 	reference_name: function(doc, cdt, cdn) {
 		var d = frappe.get_doc(cdt, cdn);
-
 		if(d.reference_name) {
 			if (d.reference_type==="Purchase Invoice" && !flt(d.debit)) {
 				this.get_outstanding('Purchase Invoice', d.reference_name, doc.company, d);
-			} else if (d.reference_type==="Sales Invoice" && !flt(d.credit)) {
+			}
+			if (d.reference_type==="Sales Invoice" && !flt(d.credit)) {
 				this.get_outstanding('Sales Invoice', d.reference_name, doc.company, d);
-			} else if (d.reference_type==="Journal Entry" && !flt(d.credit) && !flt(d.debit)) {
+			}
+			if (d.reference_type==="Journal Entry" && !flt(d.credit) && !flt(d.debit)) {
 				this.get_outstanding('Journal Entry', d.reference_name, doc.company, d);
 			}
 		}
 	},
 
-	get_outstanding: function(doctype, docname, company, child, due_date) {
+	get_outstanding: function(doctype, docname, company, child) {
 		var me = this;
 		var args = {
 			"doctype": doctype,

erpnext/accounts/doctype/journal_entry/journal_entry.json

@@ -381,7 +381,7 @@
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
-   "search_index": 1, 
+   "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
   }, 
@@ -1443,7 +1443,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2018-08-10 16:35:31.361030", 
+ "modified": "2017-08-31 11:21:09.442695", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Journal Entry", 

erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe, erpnext, json
-from frappe.utils import cstr, flt, fmt_money, formatdate, getdate
+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
@@ -12,8 +12,8 @@ from erpnext.hr.doctype.expense_claim.expense_claim import update_reimbursed_amo
 from erpnext.hr.doctype.employee_loan.employee_loan import update_disbursement_status
 
 class JournalEntry(AccountsController):
-	def __init__(self, *args, **kwargs):
-		super(JournalEntry, self).__init__(*args, **kwargs)
+	def __init__(self, arg1, arg2=None):
+		super(JournalEntry, self).__init__(arg1, arg2)
 
 	def get_feed(self):
 		return self.voucher_type
@@ -55,7 +55,7 @@ class JournalEntry(AccountsController):
 		advance_paid = frappe._dict()
 		for d in self.get("accounts"):
 			if d.is_advance:
-				if d.reference_type in ("Sales Order", "Purchase Order", "Employee Advance"):
+				if d.reference_type in ("Sales Order", "Purchase Order"):
 					advance_paid.setdefault(d.reference_type, []).append(d.reference_name)
 
 		for voucher_type, order_list in advance_paid.items():
@@ -76,13 +76,13 @@ class JournalEntry(AccountsController):
 
 	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"):
+			if d.is_advance 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:
@@ -101,6 +101,8 @@ class JournalEntry(AccountsController):
 			if account_type in ["Receivable", "Payable"]:
 				if not (d.party_type and d.party):
 					frappe.throw(_("Row {0}: Party Type and Party is required for Receivable / Payable account {1}").format(d.idx, d.account))
+			elif d.party_type and d.party:
+				frappe.throw(_("Row {0}: Party Type and Party is only applicable against Receivable / Payable account").format(d.idx))
 
 	def check_credit_limit(self):
 		customers = list(set([d.party for d in self.get("accounts")
@@ -125,7 +127,7 @@ class JournalEntry(AccountsController):
 				if (d.party_type == 'Customer' and flt(d.credit) > 0) or \
 						(d.party_type == 'Supplier' and flt(d.debit) > 0):
 					if d.is_advance=="No":
-						msgprint(_("Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.").format(d.idx, d.account), alert=1)
+						msgprint(_("Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.").format(d.idx, d.account))
 					elif d.reference_type in ("Sales Order", "Purchase Order") and d.is_advance != "Yes":
 						frappe.throw(_("Row {0}: Payment against Sales/Purchase Order should always be marked as advance").format(d.idx))
 
@@ -564,26 +566,17 @@ def get_default_bank_cash_account(company, account_type=None, mode_of_payment=No
 		account = get_bank_cash_account(mode_of_payment, company).get("account")
 
 	if not account:
-		'''
-			Set the default account first. If the user hasn't set any default account then, he doesn't
-			want us to set any random account. In this case set the account only if there is single
-			account (of that type), otherwise return empty dict.
-		'''
 		if account_type=="Bank":
 			account = frappe.db.get_value("Company", company, "default_bank_account")
 			if not account:
-				account_list = frappe.get_all("Account", filters = {"company": company,
-					"account_type": "Bank", "is_group": 0})
-				if len(account_list) == 1:
-					account = account_list[0].name
+				account = frappe.db.get_value("Account",
+					{"company": company, "account_type": "Bank", "is_group": 0})
 
 		elif account_type=="Cash":
 			account = frappe.db.get_value("Company", company, "default_cash_account")
 			if not account:
-				account_list = frappe.get_all("Account", filters = {"company": company,
-					"account_type": "Cash", "is_group": 0})
-				if len(account_list) == 1:
-					account = account_list[0].name
+				account = frappe.db.get_value("Account",
+					{"company": company, "account_type": "Cash", "is_group": 0})
 
 	if account:
 		account_details = frappe.db.get_value("Account", account,
@@ -646,8 +639,9 @@ def get_payment_entry_against_invoice(dt, dn, amount=None,  debit_in_account_cur
 		party_type = "Supplier"
 		party_account = ref_doc.credit_to
 
-	if (dt == "Sales Invoice" and ref_doc.outstanding_amount > 0) \
-		or (dt == "Purchase Invoice" and ref_doc.outstanding_amount < 0):
+
+	if (dt=="Sales Invoice" and ref_doc.outstanding_amount > 0) \
+		or (dt=="Purchase Invoice" and ref_doc.outstanding_amount < 0):
 			amount_field_party = "credit_in_account_currency"
 			amount_field_bank = "debit_in_account_currency"
 	else:
@@ -668,7 +662,6 @@ def get_payment_entry_against_invoice(dt, dn, amount=None,  debit_in_account_cur
 		"journal_entry": journal_entry
 	})
 
-
 def get_payment_entry(ref_doc, args):
 	cost_center = frappe.db.get_value("Company", ref_doc.company, "cost_center")
 	exchange_rate = 1
@@ -693,7 +686,7 @@ def get_payment_entry(ref_doc, args):
 		"cost_center": cost_center,
 		"account_type": frappe.db.get_value("Account", args.get("party_account"), "account_type"),
 		"account_currency": args.get("party_account_currency") or \
-							get_account_currency(args.get("party_account")),
+			get_account_currency(args.get("party_account")),
 		"balance": get_balance_on(args.get("party_account")),
 		"party_balance": get_balance_on(party=args.get("party"), party_type=args.get("party_type")),
 		"exchange_rate": exchange_rate,
@@ -705,7 +698,7 @@ def get_payment_entry(ref_doc, args):
 
 	bank_row = je.append("accounts")
 
-	# Make it bank_details
+	#make it bank_details
 	bank_account = get_default_bank_cash_account(ref_doc.company, "Bank", account=args.get("bank_account"))
 	if bank_account:
 		bank_row.update(bank_account)
@@ -724,7 +717,7 @@ def get_payment_entry(ref_doc, args):
 	else:
 		bank_row.set(args.get("amount_field_bank"), amount * exchange_rate)
 
-	# Multi currency check again
+	# set multi currency check
 	if party_row.account_currency != ref_doc.company_currency \
 		or (bank_row.account_currency and bank_row.account_currency != ref_doc.company_currency):
 			je.multi_currency = 1
@@ -734,7 +727,6 @@ def get_payment_entry(ref_doc, args):
 
 	return je if args.get("journal_entry") else je.as_dict()
 
-
 @frappe.whitelist()
 def get_opening_accounts(company):
 	"""get all balance sheet accounts for opening entry"""
@@ -757,7 +749,6 @@ def get_against_jv(doctype, txt, searchfield, start, page_len, filters):
 		and jv.docstatus = 1 and jv.`{0}` like %s order by jv.name desc limit %s, %s""".format(frappe.db.escape(searchfield)),
 		(filters.get("account"), cstr(filters.get("party")), "%{0}%".format(txt), start, page_len))
 
-
 @frappe.whitelist()
 def get_outstanding(args):
 	if not frappe.has_permission("Account"):
@@ -819,7 +810,6 @@ def get_party_account_and_balance(company, party_type, party):
 		"account_currency": frappe.db.get_value("Account", account, "account_currency")
 	}
 
-
 @frappe.whitelist()
 def get_account_balance_and_party_type(account, date, company, debit=None, credit=None, exchange_rate=None):
 	"""Returns dict of account balance and party type to be set in Journal Entry on selection of account."""
@@ -857,7 +847,7 @@ 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(posting_date, account=None, account_currency=None, company=None,
 		reference_type=None, reference_name=None, debit=None, credit=None, exchange_rate=None):
@@ -890,7 +880,6 @@ def get_exchange_rate(posting_date, account=None, account_currency=None, company
 	# don't return None or 0 as it is multipled with a value and that value could be lost
 	return exchange_rate or 1
 
-
 @frappe.whitelist()
 def get_average_exchange_rate(account):
 	exchange_rate = 0
@@ -899,4 +888,4 @@ def get_average_exchange_rate(account):
 		bank_balance_in_company_currency = get_balance_on(account, in_account_currency=False)
 		exchange_rate = bank_balance_in_company_currency / bank_balance_in_account_currency
 
-	return exchange_rate
+	return exchange_rate

erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json

@@ -1,6 +1,5 @@
 {
  "allow_copy": 0, 
- "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
@@ -14,7 +13,6 @@
  "engine": "InnoDB", 
  "fields": [
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -48,7 +46,6 @@
    "width": "250px"
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -78,7 +75,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -110,7 +106,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -146,7 +141,6 @@
    "width": "180px"
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -174,7 +168,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -199,12 +192,11 @@
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
-   "search_index": 1, 
+   "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -234,7 +226,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -265,7 +256,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -297,7 +287,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -328,7 +317,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -357,7 +345,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -387,7 +374,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -416,7 +402,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -447,7 +432,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -480,7 +464,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -508,7 +491,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -539,7 +521,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -572,7 +553,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -601,7 +581,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -618,7 +597,7 @@
    "label": "Reference Type", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "\nSales Invoice\nPurchase Invoice\nJournal Entry\nSales Order\nPurchase Order\nExpense Claim\nAsset\nEmployee Loan\nPayroll Entry\nEmployee Advance", 
+   "options": "\nSales Invoice\nPurchase Invoice\nJournal Entry\nSales Order\nPurchase Order\nExpense Claim\nAsset\nEmployee Loan", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -632,7 +611,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -663,7 +641,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -694,7 +671,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -722,7 +698,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -754,7 +729,6 @@
    "unique": 0
   }, 
   {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -785,17 +759,17 @@
    "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, 
- "modified": "2018-08-10 16:35:42.833549", 
+ "modified": "2017-03-02 05:02:10.102039", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Journal Entry Account", 

erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js

@@ -1,96 +0,0 @@
-// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Opening Invoice Creation Tool', {
-	setup: function(frm) {
-		frm.set_query('party_type', 'invoices', function(doc, cdt, cdn) {
-			return {
-				filters: {
-					'name': ['in', 'Customer,Supplier']
-				}
-			};
-		});
-	},
-
-	refresh: function(frm) {
-		frm.disable_save();
-		frm.trigger("make_dashboard");
-		frm.page.set_primary_action(__("Make Invoices"), () => {
-			let btn_primary = frm.page.btn_primary.get(0);
-			return frm.call({
-				doc: frm.doc,
-				freeze: true,
-				btn: $(btn_primary),
-				method: "make_invoices",
-				freeze_message: __("Creating {0} Invoice", [frm.doc.invoice_type]),
-				callback: (r) => {
-					if(!r.exc){
-						frappe.msgprint(__("Opening {0} Invoice created", [frm.doc.invoice_type]));
-						frm.clear_table("invoices");
-						frm.refresh_fields();
-						frm.reload_doc();
-					}
-				}
-			});
-		});
-	},
-
-	company: function(frm) {
-		frappe.call({
-			method: 'erpnext.accounts.doctype.opening_invoice_creation_tool.opening_invoice_creation_tool.get_temporary_opening_account',
-			args: {
-				company: frm.doc.company
-			},
-			callback: (r) => {
-				if (r.message) {
-					frm.doc.__onload.temporary_opening_account = r.message;
-					frm.trigger('update_invoice_table');
-				}
-			}
-		})
-	},
-
-	invoice_type: function(frm) {
-		$.each(frm.doc.invoices, (idx, row) => {
-			row.party_type = frm.doc.invoice_type == "Sales"? "Customer": "Supplier";
-			row.party = "";
-		});
-		frm.refresh_fields();
-	},
-
-	make_dashboard: function(frm) {
-		let max_count = frm.doc.__onload.max_count;
-		let opening_invoices_summary = frm.doc.__onload.opening_invoices_summary;
-		if(!$.isEmptyObject(opening_invoices_summary)) {
-			let section = frm.dashboard.add_section(
-				frappe.render_template('opening_invoice_creation_tool_dashboard', {
-					data: opening_invoices_summary,
-					max_count: max_count
-				})
-			);
-
-			section.on('click', '.invoice-link', function() {
-				let doctype = $(this).attr('data-type');
-				let company = $(this).attr('data-company');
-				frappe.set_route('List', doctype,
-					{'is_opening': 'Yes', 'company': company, 'docstatus': 1});
-			});
-			frm.dashboard.show();
-		}
-	},
-
-	update_invoice_table: function(frm) {
-		$.each(frm.doc.invoices, (idx, row) => {
-			if (!row.temporary_opening_account) {
-				row.temporary_opening_account = frm.doc.__onload.temporary_opening_account;
-			}
-			row.party_type = frm.doc.invoice_type == "Sales"? "Customer": "Supplier";
-		});
-	}
-});
-
-frappe.ui.form.on('Opening Invoice Creation Tool Item', {
-	invoices_add: (frm) => {
-		frm.trigger('update_invoice_table');
-	}
-});

erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json

@@ -1,184 +0,0 @@
-{
- "allow_copy": 1, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 1, 
- "creation": "2017-08-29 02:22:54.947711", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "invoice_type", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Invoice Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Sales\nPurchase", 
-   "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": "section_break_4", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Invoices", 
-   "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": 1, 
-   "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, 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Opening Invoice Creation Tool Item", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 1, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 1, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-09-05 01:30:33.235664", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Opening Invoice Creation Tool", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 0, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
-}

erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py

@@ -1,171 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe import _, scrub
-from frappe.utils import flt, nowdate
-from frappe.model.document import Document
-
-
-class OpeningInvoiceCreationTool(Document):
-	def onload(self):
-		"""Load the Opening Invoice summary"""
-		summary, max_count = self.get_opening_invoice_summary()
-		self.set_onload('opening_invoices_summary', summary)
-		self.set_onload('max_count', max_count)
-		self.set_onload('temporary_opening_account', get_temporary_opening_account(self.company))
-
-	def get_opening_invoice_summary(self):
-		def prepare_invoice_summary(doctype, invoices):
-			# add company wise sales / purchase invoice summary
-			paid_amount = []
-			outstanding_amount = []
-			for invoice in invoices:
-				company = invoice.pop("company")
-				_summary = invoices_summary.get(company, {})
-				_summary.update({
-					"currency": company_wise_currency.get(company),
-					doctype: invoice
-				})
-				invoices_summary.update({company: _summary})
-
-				paid_amount.append(invoice.paid_amount)
-				outstanding_amount.append(invoice.outstanding_amount)
-
-			if paid_amount or outstanding_amount:
-				max_count.update({
-					doctype: {
-						"max_paid": max(paid_amount) if paid_amount else 0.0,
-						"max_due": max(outstanding_amount) if outstanding_amount else 0.0
-					}
-				})
-
-		invoices_summary = {}
-		max_count = {}
-		fields = [
-			"company", "count(name) as total_invoices", "sum(outstanding_amount) as outstanding_amount"
-		]
-		companies = frappe.get_all("Company", fields=["name as company", "default_currency as currency"])
-		if not companies:
-			return None, None
-
-		company_wise_currency = {row.company: row.currency for row in companies}
-		for doctype in ["Sales Invoice", "Purchase Invoice"]:
-			invoices = frappe.get_all(doctype, filters=dict(is_opening="Yes", docstatus=1),
-				fields=fields, group_by="company")
-			prepare_invoice_summary(doctype, invoices)
-
-		return invoices_summary, max_count
-
-	def make_invoices(self):
-		names = []
-		mandatory_error_msg = _("Row {idx}: {field} is required to create the Opening {invoice_type} Invoices")
-		if not self.company:
-			frappe.throw(_("Please select the Company"))
-
-		for row in self.invoices:
-			if not row.qty:
-				row.qty = 1.0
-
-			# always mandatory fields for the invoices
-			if not row.temporary_opening_account:
-				row.temporary_opening_account = get_temporary_opening_account(self.company)
-			row.party_type = "Customer" if self.invoice_type == "Sales" else "Supplier"
-			if not row.item_name:
-				row.item_name = _("Opening Invoice Item")
-			if not row.posting_date:
-				row.posting_date = nowdate()
-			if not row.due_date:
-				row.due_date = nowdate()
-
-			for d in ("Party", "Outstanding Amount", "Temporary Opening Account"):
-				if not row.get(scrub(d)):
-					frappe.throw(mandatory_error_msg.format(
-						idx=row.idx,
-						field=_(d),
-						invoice_type=self.invoice_type
-					))
-
-			args = self.get_invoice_dict(row=row)
-			if not args:
-				continue
-
-			doc = frappe.get_doc(args).insert()
-			doc.submit()
-			names.append(doc.name)
-
-			if len(self.invoices) > 5:
-				frappe.publish_realtime(
-					"progress", dict(
-						progress=[row.idx, len(self.invoices)],
-						title=_('Creating {0}').format(doc.doctype)
-					),
-					user=frappe.session.user
-				)
-
-		return names
-
-	def get_invoice_dict(self, row=None):
-		def get_item_dict():
-			default_uom = frappe.db.get_single_value("Stock Settings", "stock_uom") or _("Nos")
-			cost_center = frappe.db.get_value("Company", self.company, "cost_center")
-			if not cost_center:
-				frappe.throw(
-					_("Please set the Default Cost Center in {0} company").format(frappe.bold(self.company))
-				)
-			rate = flt(row.outstanding_amount) / flt(row.qty)
-
-			return frappe._dict({
-				"uom": default_uom,
-				"rate": rate or 0.0,
-				"qty": row.qty,
-				"conversion_factor": 1.0,
-				"item_name": row.item_name or "Opening Invoice Item",
-				"description": row.item_name or "Opening Invoice Item",
-				income_expense_account_field: row.temporary_opening_account,
-				"cost_center": cost_center
-			})
-
-		if not row:
-			return None
-
-		party_type = "Customer"
-		income_expense_account_field = "income_account"
-		if self.invoice_type == "Purchase":
-			party_type = "Supplier"
-			income_expense_account_field = "expense_account"
-
-		item = get_item_dict()
-
-		args = frappe._dict({
-			"items": [item],
-			"is_opening": "Yes",
-			"set_posting_time": 1,
-			"company": self.company,
-			"due_date": row.due_date,
-			"posting_date": row.posting_date,
-			frappe.scrub(party_type): row.party,
-			"doctype": "Sales Invoice" if self.invoice_type == "Sales" else "Purchase Invoice",
-			"currency": frappe.db.get_value("Company", self.company, "default_currency")
-		})
-
-		if self.invoice_type == "Sales":
-			args["is_pos"] = 0
-
-		return args
-
-@frappe.whitelist()
-def get_temporary_opening_account(company=None):
-	if not company:
-		return
-
-	accounts = frappe.get_all("Account", filters={
-		'company': company,
-		'account_type': 'Temporary'
-	})
-	if not accounts:
-		frappe.throw(_("Please add a Temporary Opening account in Chart of Accounts"))
-
-	return accounts[0].name

erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html

@@ -1,32 +0,0 @@
-<h5 style="margin-top: 0px;">{{ __("Opening Invoices Summary") }}</h5>
-{% $.each(data, (company, summary) => { %}
-<h6 style="margin: 15px 0px -10px 0px;"><a class="company-link"> {{ company }}</a></h6>
-
-<table class="table table-bordered small">
-	<thead>
-		<tr>
-			<td style="width: 33%">{{ __("Invoice Type") }}</td>
-			<td style="width: 33%" class="text-right">{{ __("Opening Invoices") }}</td>
-			<td style="width: 33%" class="text-right">{{ __("Total Outstanding") }}</td>
-		</tr>
-	</thead>
-	<tbody>
-		{% $.each(["Sales Invoice", "Purchase Invoice"], (idx, doctype) => { %}
-		{% if summary[doctype] %}
-		<tr>
-			<td>
-				<a class="invoice-link" data-type="{{ doctype }}" data-company="{{ company }}">
-					{{ __(doctype) }}</a>
-			</td>
-			<td class="text-right">
-				{{ summary[doctype].total_invoices }}
-			</td>
-			<td class="text-right">
-				{{ format_currency(summary[doctype].outstanding_amount, summary.currency, 2) }}
-			</td>
-		</div>
-		{% endif %}
-		{% }); %}
-	</tbody>
-</table>
-{% }); %}

erpnext/accounts/doctype/opening_invoice_creation_tool/test_opening_invoice_creation_tool.js

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

erpnext/accounts/doctype/opening_invoice_creation_tool/test_opening_invoice_creation_tool.py

@@ -1,79 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-import frappe
-import unittest
-
-test_dependencies = ["Customer", "Supplier"]
-from erpnext.accounts.doctype.opening_invoice_creation_tool.opening_invoice_creation_tool import get_temporary_opening_account
-
-class TestOpeningInvoiceCreationTool(unittest.TestCase):
-	def make_invoices(self, invoice_type="Sales"):
-		doc = frappe.get_single("Opening Invoice Creation Tool")
-		args = get_opening_invoice_creation_dict(invoice_type=invoice_type)
-		doc.update(args)
-		return doc.make_invoices()
-
-	def test_opening_sales_invoice_creation(self):
-		invoices = self.make_invoices()
-
-		self.assertEqual(len(invoices), 2)
-		expected_value = {
-			"keys": ["customer", "outstanding_amount", "status"],
-			0: ["_Test Customer", 300, "Overdue"],
-			1: ["_Test Customer 1", 250, "Overdue"],
-		}
-		self.check_expected_values(invoices, expected_value)
-
-	def check_expected_values(self, invoices, expected_value, invoice_type="Sales"):
-		doctype = "Sales Invoice" if invoice_type == "Sales" else "Purchase Invoice"
-
-		for invoice_idx, invoice in enumerate(invoices or []):
-			si = frappe.get_doc(doctype, invoice)
-			for field_idx, field in enumerate(expected_value["keys"]):
-				self.assertEqual(si.get(field, ""), expected_value[invoice_idx][field_idx])
-
-	def test_opening_purchase_invoice_creation(self):
-		invoices = self.make_invoices(invoice_type="Purchase")
-
-		self.assertEqual(len(invoices), 2)
-		expected_value = {
-			"keys": ["supplier", "outstanding_amount", "status"],
-			0: ["_Test Supplier", 300, "Overdue"],
-			1: ["_Test Supplier 1", 250, "Overdue"],
-		}
-		self.check_expected_values(invoices, expected_value, invoice_type="Purchase", )
-
-def get_opening_invoice_creation_dict(**args):
-	party = "Customer" if args.get("invoice_type", "Sales") == "Sales" else "Supplier"
-	company = args.get("company", "_Test Company")
-
-	invoice_dict = frappe._dict({
-		"company": company,
-		"invoice_type": args.get("invoice_type", "Sales"),
-		"invoices": [
-			{
-				"qty": 1.0,
-				"outstanding_amount": 300,
-				"party": "_Test {0}".format(party),
-				"item_name": "Opening Item",
-				"due_date": "2016-09-10",
-				"posting_date": "2016-09-05",
-				"temporary_opening_account": get_temporary_opening_account(company)
-			},
-			{
-				"qty": 2.0,
-				"outstanding_amount": 250,
-				"party": "_Test {0} 1".format(party),
-				"item_name": "Opening Item",
-				"due_date": "2016-09-10",
-				"posting_date": "2016-09-05",
-				"temporary_opening_account": get_temporary_opening_account(company)
-			}
-		]
-	})
-
-	invoice_dict.update(args)
-	return invoice_dict

erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json

@@ -1,378 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2017-08-29 04:26:36.159247", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "party_type", 
-   "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": "Party Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "DocType", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "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": 1, 
-   "in_standard_filter": 0, 
-   "label": "Party", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "party_type", 
-   "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": "temporary_opening_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": "Temporary Opening Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Today", 
-   "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": 1, 
-   "in_standard_filter": 0, 
-   "label": "Posting Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "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": "Today", 
-   "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": 1, 
-   "in_standard_filter": 0, 
-   "label": "Due 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": 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": "section_break_5", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Opening Invoice Item", 
-   "fieldname": "item_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": "Item Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "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": "0", 
-   "fieldname": "outstanding_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": "Outstanding 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_4", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "1", 
-   "fieldname": "qty", 
-   "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": "Quantity", 
-   "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
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-12-19 05:07:01.549918", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Opening Invoice Creation Tool Item", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
-}

erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.py

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

erpnext/accounts/doctype/payment_entry/payment_entry.js

@@ -145,13 +145,13 @@ frappe.ui.form.on('Payment Entry', {
 			frm.doc.paid_amount : frm.doc.received_amount;
 
 		frm.toggle_display("write_off_difference_amount", (frm.doc.difference_amount && frm.doc.party &&
+			(frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency) &&
 			(frm.doc.total_allocated_amount > party_amount)));
 
 		frm.toggle_display("set_exchange_gain_loss",
 			(frm.doc.paid_amount && frm.doc.received_amount && frm.doc.difference_amount &&
-				((frm.doc.paid_from_account_currency != company_currency ||
-					frm.doc.paid_to_account_currency != company_currency) && 
-					frm.doc.paid_from_account_currency != frm.doc.paid_to_account_currency)));
+				(frm.doc.paid_from_account_currency != company_currency ||
+					frm.doc.paid_to_account_currency != company_currency)));
 
 		frm.refresh_fields();
 	},
@@ -252,26 +252,22 @@ frappe.ui.form.on('Payment Entry', {
 					date: frm.doc.posting_date
 				},
 				callback: function(r, rt) {
+					console.log(r, rt);
 					if(r.message) {
-						frappe.run_serially([
-							() => {
-								if(frm.doc.payment_type == "Receive") {
-									frm.set_value("paid_from", r.message.party_account);
-									frm.set_value("paid_from_account_currency", r.message.party_account_currency);
-									frm.set_value("paid_from_account_balance", r.message.account_balance);
-								} else if (frm.doc.payment_type == "Pay"){
-									frm.set_value("paid_to", r.message.party_account);
-									frm.set_value("paid_to_account_currency", r.message.party_account_currency);
-									frm.set_value("paid_to_account_balance", r.message.account_balance);
-								}
-							},
-							() => frm.set_value("party_balance", r.message.party_balance),
-							() => frm.set_value("party_name", r.message.party_name),
-							() => frm.events.get_outstanding_documents(frm),
-							() => frm.events.hide_unhide_fields(frm),
-							() => frm.events.set_dynamic_labels(frm),
-							() => { frm.set_party_account_based_on_party = false; }
-						]);
+						if(frm.doc.payment_type == "Receive") {
+							frm.set_value("paid_from", r.message.party_account);
+							frm.set_value("paid_from_account_currency", r.message.party_account_currency);
+							frm.set_value("paid_from_account_balance", r.message.account_balance);
+						} else if (frm.doc.payment_type == "Pay"){
+							frm.set_value("paid_to", r.message.party_account);
+							frm.set_value("paid_to_account_currency", r.message.party_account_currency);
+							frm.set_value("paid_to_account_balance", r.message.account_balance);
+						}
+						frm.set_value("party_balance", r.message.party_balance);
+						frm.events.get_outstanding_documents(frm);
+						frm.events.hide_unhide_fields(frm);
+						frm.events.set_dynamic_labels(frm);
+						frm.set_party_account_based_on_party = false;
 					}
 				}
 			});
@@ -300,15 +296,7 @@ frappe.ui.form.on('Payment Entry', {
 				if(frm.doc.payment_type == "Pay") {
 					frm.events.get_outstanding_documents(frm);
 				} else if (frm.doc.payment_type == "Receive") {
-					if(frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency) {
-						if(frm.doc.source_exchange_rate) {
-							frm.set_value("target_exchange_rate", frm.doc.source_exchange_rate);
-						}
-						frm.set_value("received_amount", frm.doc.paid_amount);
-						
-					} else {
-						frm.events.received_amount(frm);
-					}
+					frm.events.received_amount(frm);
 				}
 			}
 		);
@@ -325,31 +313,26 @@ frappe.ui.form.on('Payment Entry', {
 				},
 				callback: function(r, rt) {
 					if(r.message) {
-						frappe.run_serially([
-							() => frm.set_value(currency_field, r.message['account_currency']),
-							() => {
-								frm.set_value(balance_field, r.message['account_balance']);
+						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(callback_function) callback_function(frm);
+							if(!frm.doc.paid_amount && frm.doc.received_amount)
+								frm.events.received_amount(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);
 					}
 				}
 			});			
@@ -418,11 +401,8 @@ frappe.ui.form.on('Payment Entry', {
 				frm.set_value("base_received_amount", frm.doc.base_paid_amount);
 			}
 			
-			frm.events.set_unallocated_amount(frm);
+			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() ? 0 : 1);
 	},
 
 	target_exchange_rate: function(frm) {
@@ -438,12 +418,9 @@ frappe.ui.form.on('Payment Entry', {
 				frm.set_value("base_paid_amount", frm.doc.base_received_amount);
 			}
 			
-			frm.events.set_unallocated_amount(frm);
+			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() ? 0 : 1);
 	},
 
 	paid_amount: function(frm) {
@@ -469,7 +446,7 @@ frappe.ui.form.on('Payment Entry', {
 		if(frm.doc.payment_type == "Pay")
 			frm.events.allocate_party_amount_against_ref_docs(frm, frm.doc.received_amount);
 		else
-			frm.events.set_unallocated_amount(frm);
+			frm.events.set_difference_amount(frm);
 		
 		frm.set_paid_amount_based_on_received_amount = false;
 	},
@@ -489,7 +466,7 @@ frappe.ui.form.on('Payment Entry', {
 		if(frm.doc.payment_type == "Receive")
 			frm.events.allocate_party_amount_against_ref_docs(frm, frm.doc.paid_amount);
 		else
-			frm.events.set_unallocated_amount(frm);
+			frm.events.set_difference_amount(frm);
 	},
 
 	get_outstanding_documents: function(frm) {
@@ -526,7 +503,7 @@ frappe.ui.form.on('Payment Entry', {
 						c.outstanding_amount = d.outstanding_amount;
 						c.bill_no = d.bill_no;
 
-						if(!in_list(["Sales Order", "Purchase Order", "Expense Claim", "Fees"], d.voucher_type)) {
+						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
@@ -541,7 +518,7 @@ frappe.ui.form.on('Payment Entry', {
 						} else {
 							c.exchange_rate = 1;
 						}
-						if (in_list(['Sales Invoice', 'Purchase Invoice', "Expense Claim", "Fees"], d.reference_doctype)){
+						if (in_list(['Sales Invoice', 'Purchase Invoice', "Expense Claim"], d.reference_doctype)){
 							c.due_date = d.due_date;
 						}
 					});
@@ -549,8 +526,7 @@ frappe.ui.form.on('Payment Entry', {
 					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") ||
-						(frm.doc.payment_type=="Receive" && frm.doc.party_type=="Student") 
+						(frm.doc.payment_type=="Pay" && frm.doc.party_type=="Employee")
 					) {
 						if(total_positive_outstanding > total_negative_outstanding)
 							frm.set_value("paid_amount",
@@ -578,20 +554,13 @@ frappe.ui.form.on('Payment Entry', {
 		if(frm.doc.references.length == 0){
 			frm.events.get_outstanding_documents(frm);
 		}
-		if(frm.doc.payment_type == 'Internal Transfer') {
-			frm.events.allocate_party_amount_against_ref_docs(frm, frm.doc.paid_amount);
-		} else {
-			frm.events.allocate_party_amount_against_ref_docs(frm, frm.doc.received_amount);
-		}
+
+		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;
-		var total_deductions = frappe.utils.sum($.map(frm.doc.deductions || [],
-			function(d) { return flt(d.amount) }));
-
-		paid_amount -= total_deductions;
 
 		$.each(frm.doc.references || [], function(i, row) {
 			if(flt(row.outstanding_amount) > 0)
@@ -601,16 +570,13 @@ frappe.ui.form.on('Payment Entry', {
 		})
 
 		var allocated_negative_outstanding = 0;
-		if (
-				(frm.doc.payment_type=="Receive" && frm.doc.party_type=="Customer") ||
+		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") ||
-				(frm.doc.payment_type=="Receive" && frm.doc.party_type=="Student")
-			) {
-				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 ?
-						total_negative_outstanding : remaining_outstanding;
+				(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 ?
+					total_negative_outstanding : remaining_outstanding;
 			}
 
 			var allocated_positive_outstanding =  paid_amount + allocated_negative_outstanding;
@@ -671,32 +637,21 @@ frappe.ui.form.on('Payment Entry', {
 		frm.set_value("total_allocated_amount", Math.abs(total_allocated_amount));
 		frm.set_value("base_total_allocated_amount", Math.abs(base_total_allocated_amount));
 
-		frm.events.set_unallocated_amount(frm);
+		frm.events.set_difference_amount(frm);
 	},
 
-	set_unallocated_amount: function(frm) {
+	set_difference_amount: function(frm) {
 		var unallocated_amount = 0;
-		var total_deductions = frappe.utils.sum($.map(frm.doc.deductions || [],
-			function(d) { return flt(d.amount) }));
-
 		if(frm.doc.party) {
-			if(frm.doc.payment_type == "Receive"
-				&& frm.doc.base_total_allocated_amount < frm.doc.base_received_amount + total_deductions
-				&& frm.doc.total_allocated_amount < frm.doc.paid_amount + (total_deductions / frm.doc.source_exchange_rate)) {
-					unallocated_amount = (frm.doc.base_received_amount + total_deductions
-						- frm.doc.base_total_allocated_amount) / frm.doc.source_exchange_rate;
-			} else if (frm.doc.payment_type == "Pay"
-				&& frm.doc.base_total_allocated_amount < frm.doc.base_paid_amount - total_deductions
-				&& frm.doc.total_allocated_amount < frm.doc.received_amount + (total_deductions / frm.doc.target_exchange_rate)) {
-					unallocated_amount = (frm.doc.base_paid_amount - (total_deductions
-						+ frm.doc.base_total_allocated_amount)) / frm.doc.target_exchange_rate;
+			var party_amount = frm.doc.payment_type=="Receive" ?
+				frm.doc.paid_amount : frm.doc.received_amount;
+
+			if(frm.doc.total_allocated_amount < party_amount) {
+				unallocated_amount = party_amount - frm.doc.total_allocated_amount;
 			}
 		}
 		frm.set_value("unallocated_amount", unallocated_amount);
-		frm.trigger("set_difference_amount");
-	},
-	
-	set_difference_amount: function(frm) {
+
 		var difference_amount = 0;
 		var base_unallocated_amount = flt(frm.doc.unallocated_amount) *
 			(frm.doc.payment_type=="Receive" ? frm.doc.source_exchange_rate : frm.doc.target_exchange_rate);
@@ -719,10 +674,6 @@ frappe.ui.form.on('Payment Entry', {
 		frm.events.hide_unhide_fields(frm);
 	},
 
-	unallocated_amount: function(frm) {
-		frm.trigger("set_difference_amount");
-	},
-
 	check_mandatory_to_fetch: function(frm) {
 		$.each(["Company", "Party Type", "Party", "payment_type"], function(i, field) {
 			if(!frm.doc[frappe.model.scrub(field)]) {
@@ -802,7 +753,7 @@ frappe.ui.form.on('Payment Entry', {
 						row.amount = flt(row.amount) + flt(frm.doc.difference_amount);
 						refresh_field("deductions");
 
-						frm.events.set_unallocated_amount(frm);
+						frm.events.set_difference_amount(frm);
 					}
 				}
 			})
@@ -819,30 +770,23 @@ frappe.ui.form.on('Payment Entry Reference', {
 
 	reference_name: function(frm, cdt, cdn) {
 		var row = locals[cdt][cdn];
-		if (row.reference_name && row.reference_doctype) {
-			return frappe.call({
-				method: "erpnext.accounts.doctype.payment_entry.payment_entry.get_reference_details",
-				args: {
-					reference_doctype: row.reference_doctype,
-					reference_name: row.reference_name,
-					party_account_currency: frm.doc.payment_type=="Receive" ?
-						frm.doc.paid_from_account_currency : frm.doc.paid_to_account_currency
-				},
-				callback: function(r, rt) {
-					if(r.message) {
-						$.each(r.message, function(field, value) {
-							frappe.model.set_value(cdt, cdn, field, value);
-						})
-
-						let allocated_amount = frm.doc.unallocated_amount > row.outstanding_amount ?
-							row.outstanding_amount : frm.doc.unallocated_amount;
-
-						frappe.model.set_value(cdt, cdn, 'allocated_amount', allocated_amount);
-						frm.refresh_fields();
-					}
+		return frappe.call({
+			method: "erpnext.accounts.doctype.payment_entry.payment_entry.get_reference_details",
+			args: {
+				reference_doctype: row.reference_doctype,
+				reference_name: row.reference_name,
+				party_account_currency: frm.doc.payment_type=="Receive" ?
+					frm.doc.paid_from_account_currency : frm.doc.paid_to_account_currency
+			},
+			callback: function(r, rt) {
+				if(r.message) {
+					$.each(r.message, function(field, value) {
+						frappe.model.set_value(cdt, cdn, field, value);
+					})
+					frm.refresh_fields();
 				}
-			})
-		}
+			}
+		})
 	},
 
 	allocated_amount: function(frm) {
@@ -856,10 +800,10 @@ frappe.ui.form.on('Payment Entry Reference', {
 
 frappe.ui.form.on('Payment Entry Deduction', {
 	amount: function(frm) {
-		frm.events.set_unallocated_amount(frm);
+		frm.events.set_difference_amount(frm);
 	},
 
 	deductions_remove: function(frm) {
-		frm.events.set_unallocated_amount(frm);
+		frm.events.set_difference_amount(frm);
 	}
 })

erpnext/accounts/doctype/payment_entry/payment_entry.json

@@ -286,7 +286,7 @@
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
-   "search_index": 1, 
+   "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
   }, 
@@ -1188,7 +1188,7 @@
    "precision": "", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1439,7 +1439,7 @@
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
-   "search_index": 1, 
+   "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
   }, 
@@ -1555,7 +1555,7 @@
    "in_standard_filter": 0, 
    "label": "Remarks", 
    "length": 0, 
-   "no_copy": 1, 
+   "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -1791,7 +1791,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-08-10 16:34:46.771275", 
+ "modified": "2017-08-31 11:20:37.578469", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Entry", 

erpnext/accounts/doctype/payment_entry/payment_entry.py

@@ -3,28 +3,21 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-import frappe, erpnext, json
+import frappe, json
 from frappe import _, scrub, ValidationError
 from frappe.utils import flt, comma_or, nowdate
 from erpnext.accounts.utils import get_outstanding_invoices, get_account_currency, get_balance_on
 from erpnext.accounts.party import get_party_account
-from erpnext.accounts.doctype.journal_entry.journal_entry import get_default_bank_cash_account
+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 InvalidPaymentEntry(ValidationError): pass
 
 class PaymentEntry(AccountsController):
-	def __init__(self, *args, **kwargs):
-		super(PaymentEntry, self).__init__(*args, **kwargs)
-		if not self.is_new():
-			self.setup_party_account_field()
-
 	def setup_party_account_field(self):
 		self.party_account_field = None
 		self.party_account = None
@@ -63,35 +56,31 @@ class PaymentEntry(AccountsController):
 		if self.difference_amount:
 			frappe.throw(_("Difference Amount must be zero"))
 		self.make_gl_entries()
-		self.update_outstanding_amounts()
 		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_outstanding_amounts()
 		self.update_advance_paid()
 		self.update_expense_claim()
 		self.delink_advance_entry_references()
 
-	def update_outstanding_amounts(self):
-		self.set_missing_ref_details(force=True)
-
 	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))
+				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"):
@@ -139,14 +128,15 @@ class PaymentEntry(AccountsController):
 
 		self.set_missing_ref_details()
 
-	def set_missing_ref_details(self, force=False):
+
+	def set_missing_ref_details(self):
 		for d in self.get("references"):
 			if d.allocated_amount:
 				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) or force:
+					if not d.get(field):
 						d.set(field, value)
 
 	def validate_payment_type(self):
@@ -158,7 +148,7 @@ class PaymentEntry(AccountsController):
 			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 and self.party_type != "Employee":
+			if self.party_account:
 				party_account_type = "Receivable" if self.party_type in ("Customer", "Student") else "Payable"
 				self.validate_account_type(self.party_account, [party_account_type])
 
@@ -199,7 +189,7 @@ class PaymentEntry(AccountsController):
 		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", "Employee Advance")
+			valid_reference_doctypes = ("Expense Claim", "Journal Entry")
 
 		for d in self.get("references"):
 			if not d.allocated_amount:
@@ -216,7 +206,7 @@ class PaymentEntry(AccountsController):
 
 					if d.reference_doctype != "Journal Entry":
 						if self.party != ref_doc.get(scrub(self.party_type)):
-							frappe.throw(_("{0} {1} is not associated with {2} {3}")
+							frappe.throw(_("{0} {1} does not associated with {2} {3}")
 								.format(d.reference_doctype, d.reference_name, self.party_type, self.party))
 					else:
 						self.validate_journal_entry()
@@ -291,23 +281,16 @@ class PaymentEntry(AccountsController):
 		self.base_total_allocated_amount = abs(base_total_allocated_amount)
 
 	def set_unallocated_amount(self):
-		self.unallocated_amount = 0
+		self.unallocated_amount = 0;
 		if self.party:
-			total_deductions = sum([flt(d.amount) for d in self.get("deductions")])
-			if self.payment_type == "Receive" \
-				and self.base_total_allocated_amount < self.base_received_amount + total_deductions \
-				and self.total_allocated_amount < self.paid_amount + (total_deductions / self.source_exchange_rate):
-					self.unallocated_amount = (self.base_received_amount + total_deductions - 
-						self.base_total_allocated_amount) / self.source_exchange_rate
-			elif self.payment_type == "Pay" \
-				and self.base_total_allocated_amount < (self.base_paid_amount - total_deductions) \
-				and self.total_allocated_amount < self.received_amount + (total_deductions / self.target_exchange_rate):
-					self.unallocated_amount = (self.base_paid_amount - (total_deductions + 
-						self.base_total_allocated_amount)) / self.target_exchange_rate
+			party_amount = self.paid_amount if self.payment_type=="Receive" else self.received_amount
+
+			if self.total_allocated_amount < party_amount:
+				self.unallocated_amount = party_amount - self.total_allocated_amount
 
 	def set_difference_amount(self):
 		base_unallocated_amount = flt(self.unallocated_amount) * (flt(self.source_exchange_rate)
-			if self.payment_type == "Receive" else flt(self.target_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)
 
@@ -323,10 +306,9 @@ class PaymentEntry(AccountsController):
 		self.difference_amount = flt(self.difference_amount - total_deductions,
 			self.precision("difference_amount"))
 
-	# Paid amount is auto allocated in the reference document by default.
-	# Clear the reference document which doesn't have allocated amount on validate so that form can be loaded fast
 	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`
 			where parent = %s and allocated_amount = 0""", self.name)
 
@@ -337,15 +319,14 @@ class PaymentEntry(AccountsController):
 			total_negative_outstanding = sum([abs(flt(d.outstanding_amount))
 				for d in self.get("references") if flt(d.outstanding_amount) < 0])
 
-			paid_amount = self.paid_amount if self.payment_type=="Receive" else self.received_amount
-			additional_charges = sum([flt(d.amount) for d in self.deductions])
+			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"),
 						self.party_type), InvalidPaymentEntry)
 
-			elif paid_amount - additional_charges > total_negative_outstanding:
+			elif party_amount > total_negative_outstanding:
 				frappe.throw(_("Paid Amount cannot be greater than total negative outstanding amount {0}")
 					.format(total_negative_outstanding), InvalidPaymentEntry)
 
@@ -496,9 +477,8 @@ class PaymentEntry(AccountsController):
 	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", "Employee Advance"):
-						frappe.get_doc(d.reference_doctype, d.reference_name).set_total_advance_paid()
+				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:
@@ -520,19 +500,16 @@ def get_outstanding_reference_documents(args):
 	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 = []
-	if args.get("party_type") not in ["Student", "Employee"] and not args.get("voucher_no"):
+	if (args.get("party_type") != "Student"):
 		negative_outstanding_invoices = get_negative_outstanding_invoices(args.get("party_type"),
-			args.get("party"), args.get("party_account"), party_account_currency, company_currency)
+			args.get("party"), args.get("party_account"), total_field)
 
 	# Get positive outstanding sales /purchase invoices/ Fees
-	condition = ""
-	if args.get("voucher_type") and args.get("voucher_no"):
-		condition = " and voucher_type='{0}' and voucher_no='{1}'"\
-			.format(frappe.db.escape(args["voucher_type"]), frappe.db.escape(args["voucher_no"]))
-
 	outstanding_invoices = get_outstanding_invoices(args.get("party_type"), args.get("party"),
-		args.get("party_account"), condition=condition)
+		args.get("party_account"))
 
 	for d in outstanding_invoices:
 		d["exchange_rate"] = 1
@@ -554,7 +531,6 @@ def get_outstanding_reference_documents(args):
 
 	return negative_outstanding_invoices + outstanding_invoices + orders_to_be_billed
 
-
 def get_orders_to_be_billed(posting_date, party_type, party, party_account_currency, company_currency):
 	if party_type == "Customer":
 		voucher_type = 'Sales Order'
@@ -583,50 +559,44 @@ def get_orders_to_be_billed(posting_date, party_type, party, party_account_curre
 				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)
+			""".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
 		# 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)
+		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, party_account_currency, company_currency):
-	voucher_type = "Sales Invoice" if party_type == "Customer" else "Purchase Invoice"
-	if party_account_currency == company_currency:
-		grand_total_field = "base_grand_total"
-		rounded_total_field = "base_rounded_total"
+def get_negative_outstanding_invoices(party_type, party, party_account, total_field):
+	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:
-		grand_total_field = "grand_total"
-		rounded_total_field = "rounded_total"
-
-	return frappe.db.sql("""
-		select
-			"{voucher_type}" as voucher_type, name as voucher_no,
-			if({rounded_total_field}, {rounded_total_field}, {grand_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(**{
-			"rounded_total_field": rounded_total_field,
-			"grand_total_field": grand_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)
-
+		return []
 
 @frappe.whitelist()
 def get_party_details(company, party_type, party, date):
@@ -637,19 +607,15 @@ def get_party_details(company, party_type, party, date):
 
 	account_currency = get_account_currency(party_account)
 	account_balance = get_balance_on(party_account, date)
-	_party_name = "title" if party_type == "Student" else party_type.lower() + "_name"
-	party_name = frappe.db.get_value(party_type, party, _party_name)
 	party_balance = get_balance_on(party_type=party_type, party=party)
 
 	return {
 		"party_account": party_account,
-		"party_name": party_name,
 		"party_account_currency": account_currency,
 		"party_balance": party_balance,
 		"account_balance": account_balance
 	}
 
-
 @frappe.whitelist()
 def get_account_details(account, date):
 	frappe.has_permission('Payment Entry', throw=True)
@@ -659,7 +625,6 @@ def get_account_details(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"]
@@ -672,48 +637,19 @@ def get_company_defaults(company):
 
 	return ret
 
-
-def get_outstanding_on_journal_entry(name):
-	res = frappe.db.sql(
-			'SELECT '
-			'CASE WHEN party_type IN ("Customer", "Student") '
-			'THEN ifnull(sum(debit_in_account_currency - credit_in_account_currency), 0) '
-			'ELSE ifnull(sum(credit_in_account_currency - debit_in_account_currency), 0) '
-			'END as outstanding_amount '
-			'FROM `tabGL Entry` WHERE (voucher_no=%s OR against_voucher=%s) '
-			'AND party_type IS NOT NULL '
-			'AND party_type != ""',
-			(name, name), as_dict=1
-		)
-
-	outstanding_amount = res[0].get('outstanding_amount', 0) if res else 0
-
-	return outstanding_amount
-
-
 @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)
-	company_currency = ref_doc.get("company_currency") or erpnext.get_company_currency(ref_doc.company)
 
 	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" and ref_doc.docstatus == 1:
-		total_amount = ref_doc.get("total_amount")
-		if ref_doc.multi_currency:
-			exchange_rate = get_exchange_rate(party_account_currency, company_currency, ref_doc.posting_date)
-		else:
-			exchange_rate = 1
-			outstanding_amount = get_outstanding_on_journal_entry(reference_name)
 	elif reference_doctype != "Journal Entry":
-		if party_account_currency == company_currency:
+		if party_account_currency == ref_doc.company_currency:
 			if ref_doc.doctype == "Expense Claim":
 				total_amount = ref_doc.total_sanctioned_amount
-			elif ref_doc.doctype == "Employee Advance":
-				total_amount = ref_doc.advance_amount
 			else:
 				total_amount = ref_doc.base_grand_total
 			exchange_rate = 1
@@ -723,21 +659,15 @@ def get_reference_details(reference_doctype, reference_name, party_account_curre
 			# 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, company_currency, ref_doc.posting_date)
+				get_exchange_rate(party_account_currency, ref_doc.company_currency, ref_doc.posting_date)
 
-		if reference_doctype in ("Sales Invoice", "Purchase Invoice"):
-			outstanding_amount = ref_doc.get("outstanding_amount")
-		elif reference_doctype == "Expense Claim":
-			outstanding_amount = flt(ref_doc.get("total_sanctioned_amount")) \
-				- flt(ref_doc.get("total_amount+reimbursed")) - flt(ref_doc.get("total_advance_amount"))
-		elif reference_doctype == "Employee Advance":
-			outstanding_amount = ref_doc.advance_amount - flt(ref_doc.paid_amount)
-		else:
-			outstanding_amount = flt(total_amount) - flt(ref_doc.advance_paid)
+		outstanding_amount = ref_doc.get("outstanding_amount") \
+			if reference_doctype in ("Sales Invoice", "Purchase Invoice", "Expense Claim") \
+			else flt(total_amount) - flt(ref_doc.advance_paid)
 	else:
 		# Get the exchange rate based on the posting date of the ref doc
 		exchange_rate = get_exchange_rate(party_account_currency,
-			company_currency, ref_doc.posting_date)
+			ref_doc.company_currency, ref_doc.posting_date)
 
 	return frappe._dict({
 		"due_date": ref_doc.get("due_date"),
@@ -746,7 +676,6 @@ def get_reference_details(reference_doctype, reference_name, party_account_curre
 		"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)
@@ -758,7 +687,7 @@ def get_payment_entry(dt, dn, party_amount=None, bank_account=None, bank_amount=
 		party_type = "Customer"
 	elif dt in ("Purchase Invoice", "Purchase Order"):
 		party_type = "Supplier"
-	elif dt in ("Expense Claim", "Employee Advance"):
+	elif dt in ("Expense Claim"):
 		party_type = "Employee"
 	elif dt in ("Fees"):
 		party_type = "Student"
@@ -770,10 +699,6 @@ def get_payment_entry(dt, dn, party_amount=None, bank_account=None, bank_amount=
 		party_account = doc.credit_to
 	elif dt == "Fees":
 		party_account = doc.receivable_account
-	elif dt == "Employee Advance":
-		party_account = doc.advance_account
-	elif dt == "Expense Claim":
-		party_account = doc.payable_account
 	else:
 		party_account = get_party_account(party_type, doc.get(party_type.lower()), doc.company)
 
@@ -791,26 +716,17 @@ def get_payment_entry(dt, dn, party_amount=None, bank_account=None, bank_amount=
 	if party_amount:
 		grand_total = outstanding_amount = party_amount
 	elif dt in ("Sales Invoice", "Purchase Invoice"):
-		if party_account_currency == doc.company_currency:
-			grand_total = doc.base_rounded_total or doc.base_grand_total
-		else:
-			grand_total = doc.rounded_total or doc.grand_total
+		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 - flt(doc.total_advance_amount)
-	elif dt == "Employee Advance":
-		grand_total = doc.advance_amount
-		outstanding_amount = flt(doc.advance_amount) - flt(doc.paid_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:
-		if party_account_currency == doc.company_currency:
-			grand_total = flt(doc.get("base_rounded_total") or doc.base_grand_total)
-		else:
-			grand_total = flt(doc.get("rounded_total") or doc.grand_total)
+		total_field = "base_grand_total" if party_account_currency == doc.company_currency else "grand_total"
+		grand_total = flt(doc.get(total_field))
 		outstanding_amount = grand_total - flt(doc.advance_paid)
 
 	# bank or cash
@@ -847,13 +763,12 @@ def get_payment_entry(dt, dn, party_amount=None, bank_account=None, bank_amount=
 	pe.letter_head = doc.get("letter_head")
 
 	pe.append("references", {
-		'reference_doctype': dt,
-		'reference_name': dn,
-		"bill_no": doc.get("bill_no"),
+		"reference_doctype": dt,
+		"reference_name": dn,
 		"due_date": doc.get("due_date"),
-		'total_amount': grand_total,
-		'outstanding_amount': outstanding_amount,
-		'allocated_amount': outstanding_amount
+		"total_amount": grand_total,
+		"outstanding_amount": outstanding_amount,
+		"allocated_amount": outstanding_amount
 	})
 
 	pe.setup_party_account_field()
@@ -861,25 +776,4 @@ def get_payment_entry(dt, dn, party_amount=None, bank_account=None, bank_amount=
 	if party_account and bank:
 		pe.set_exchange_rate()
 		pe.set_amounts()
-	return pe
-
-
-def get_paid_amount(dt, dn, party_type, party, account, due_date):
-	if party_type=="Customer":
-		dr_or_cr = "credit_in_account_currency - debit_in_account_currency"
-	else:
-		dr_or_cr = "debit_in_account_currency - credit_in_account_currency"
-
-	paid_amount = frappe.db.sql("""
-		select ifnull(sum({dr_or_cr}), 0) as paid_amount
-		from `tabGL Entry`
-		where against_voucher_type = %s
-			and against_voucher = %s
-			and party_type = %s
-			and party = %s
-			and account = %s
-			and due_date = %s
-			and {dr_or_cr} > 0
-	""".format(dr_or_cr=dr_or_cr), (dt, dn, party_type, party, account, due_date))
-
-	return paid_amount[0][0] if paid_amount else 0
+	return pe

erpnext/accounts/doctype/payment_entry/test_payment_entry.py

@@ -14,7 +14,6 @@ from erpnext.hr.doctype.expense_claim.test_expense_claim import make_expense_cla
 
 test_dependencies = ["Item"]
 
-
 class TestPaymentEntry(unittest.TestCase):
 	def test_payment_entry_against_order(self):
 		so = make_sales_order()
@@ -41,7 +40,7 @@ class TestPaymentEntry(unittest.TestCase):
 		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",
+		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"
@@ -67,7 +66,7 @@ class TestPaymentEntry(unittest.TestCase):
 		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",
+		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"
@@ -89,12 +88,11 @@ class TestPaymentEntry(unittest.TestCase):
 	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")
+		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.paid_to = payable
 		pe.insert()
 		pe.submit()
 
@@ -110,7 +108,7 @@ class TestPaymentEntry(unittest.TestCase):
 		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",
+		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,
 			bank_account="_Test Bank - _TC", bank_amount=900)
@@ -141,6 +139,7 @@ class TestPaymentEntry(unittest.TestCase):
 	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")
@@ -150,7 +149,6 @@ class TestPaymentEntry(unittest.TestCase):
 		pe.paid_from = "_Test Bank USD - _TC"
 		pe.paid_to = "_Test Bank - _TC"
 		pe.paid_amount = 100
-		pe.received_amount = 100
 		pe.reference_no = "3"
 		pe.reference_date = "2016-01-10"
 		pe.party_type = "Supplier"
@@ -214,7 +212,7 @@ class TestPaymentEntry(unittest.TestCase):
 
 		self.assertRaises(InvalidPaymentEntry, pe1.validate)
 
-		si1 = create_sales_invoice()
+		si1 =  create_sales_invoice()
 
 		# create full payment entry against si1
 		pe2 = get_payment_entry("Sales Invoice", si1.name, bank_account="_Test Cash - _TC")

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

@@ -1,60 +0,0 @@
-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_deduction/payment_entry_deduction.json

@@ -98,7 +98,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2018-02-21 03:28:03.420683", 
+ "modified": "2016-07-11 03:28:03.420683", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Entry Deduction", 

erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json

@@ -296,7 +296,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-10-16 17:37:01.192312", 
+ "modified": "2017-09-04 17:37:01.192312", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Entry Reference", 
@@ -311,4 +311,4 @@
  "sort_order": "DESC", 
  "track_changes": 1, 
  "track_seen": 0
-}
+}

erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js

@@ -3,26 +3,9 @@
 
 frappe.provide("erpnext.accounts");
 
-frappe.ui.form.on("Payment Reconciliation Payment", {
-	invoice_number: function(frm, cdt, cdn) {
-		var row = locals[cdt][cdn];
-		if(row.invoice_number) {
-			var parts = row.invoice_number.split(' | ');
-			var invoice_type = parts[0];
-			var invoice_number = parts[1];
-
-			var invoice_amount = frm.doc.invoices.filter(function(d) {
-				return d.invoice_type === invoice_type && d.invoice_number === invoice_number;
-			})[0].outstanding_amount;
-
-			frappe.model.set_value(cdt, cdn, "allocated_amount", Math.min(invoice_amount, row.amount));
-		}
-	}
-});
-
 erpnext.accounts.PaymentReconciliationController = frappe.ui.form.Controller.extend({
 	onload: function() {
-		var me = this;
+		var me = this
 		this.frm.set_query("party_type", function() {
 			return{
 				query: "erpnext.setup.doctype.party_type.party_type.get_party_type"

erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py

@@ -30,8 +30,7 @@ class PaymentReconciliation(Document):
 		return payment_entries
 
 	def get_jv_entries(self):
-		dr_or_cr = "credit_in_account_currency" if self.party_type == "Customer" \
-			else "debit_in_account_currency"
+		dr_or_cr = self.get_dr_or_cr()
 
 		bank_account_condition = "t2.against_account like %(bank_cash_account)s" \
 				if self.bank_cash_account else "1=1"
@@ -55,7 +54,6 @@ class PaymentReconciliation(Document):
 					THEN 1=1
 					ELSE {bank_account_condition}
 				END)
-			order by t1.posting_date
 			""".format(**{
 				"dr_or_cr": dr_or_cr,
 				"bank_account_condition": bank_account_condition,
@@ -74,13 +72,13 @@ class PaymentReconciliation(Document):
 			row = self.append('payments', {})
 			row.update(e)
 
-	def get_invoice_entries(self):
+	def get_invoice_entries(self, paying_party=False):
 		#Fetch JVs, Sales and Purchase Invoices for 'invoices' to reconcile against
 
 		condition = self.check_condition()
 
 		non_reconciled_invoices = get_outstanding_invoices(self.party_type, self.party,
-			self.receivable_payable_account, condition=condition)
+			self.receivable_payable_account, condition=condition, paying_party=paying_party)
 
 		self.add_invoice_entries(non_reconciled_invoices)
 
@@ -104,8 +102,7 @@ class PaymentReconciliation(Document):
 
 		self.get_invoice_entries()
 		self.validate_invoice()
-		dr_or_cr = "credit_in_account_currency" \
-			if self.party_type == "Customer" else "debit_in_account_currency"
+		dr_or_cr = self.get_dr_or_cr()
 			
 		lst = []
 		for e in self.get('payments'):
@@ -185,3 +182,12 @@ class PaymentReconciliation(Document):
 			cond += " and `{0}` <= {1}".format(dr_or_cr, flt(self.maximum_amount))
 
 		return cond
+
+	def get_dr_or_cr(self):
+		'''Return credit_in_account_currency if not set and party is customer.'''
+		if hasattr(self, "dr_or_cr"):
+			return self.dr_or_cr
+		if self.party_type == 'Customer':
+			return "credit_in_account_currency"
+		else:
+			return "debit_in_account_currency"

erpnext/accounts/doctype/payment_request/payment_request.json

@@ -26,7 +26,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_global_search": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
@@ -432,7 +432,7 @@
    "options": "<pre><h5>Message Example</h5>\n\n&lt;p&gt;Dear {{ doc.contact_person }},&lt;/p&gt;\n\n&lt;p&gt;Requesting payment for {{ doc.doctype }}, {{ doc.name }} for {{ doc.grand_total }}.&lt;/p&gt;\n\n&lt;a href=\"{{ payment_url }}\"&gt; click here to pay &lt;/a&gt;\n\n</pre>\n", 
    "permlevel": 0, 
    "precision": "", 
-   "print_hide": 1, 
+   "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "remember_last_selected_value": 0, 
@@ -728,7 +728,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-12-02 15:50:41.775006", 
+ "modified": "2017-06-13 14:29:20.388372", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Request", 

erpnext/accounts/doctype/payment_request/payment_request.py

@@ -78,9 +78,6 @@ class PaymentRequest(Document):
 		controller = get_payment_gateway_controller(self.payment_gateway)
 		controller.validate_transaction_currency(self.currency)
 
-		if hasattr(controller, 'validate_minimum_transaction_amount'):
-			controller.validate_minimum_transaction_amount(self.currency, self.grand_total)
-
 		return controller.get_payment_url(**{
 			"amount": flt(self.grand_total, self.precision("grand_total")),
 			"title": data.company.encode("utf-8"),
@@ -297,7 +294,7 @@ def get_gateway_details(args):
 	if args.get("payment_gateway"):
 		return get_payment_gateway_account(args.get("payment_gateway"))
 
-	if args.order_type == "Shopping Cart":
+	if args.cart:
 		payment_gateway_account = frappe.get_doc("Shopping Cart Settings").payment_gateway_account
 		return get_payment_gateway_account(payment_gateway_account)
 

erpnext/accounts/doctype/payment_request/test_payment_request.py

@@ -61,11 +61,13 @@ class TestPaymentRequest(unittest.TestCase):
 		self.assertEquals(pr.currency, "USD")
 
 	def test_payment_entry(self):
-		frappe.db.set_value("Company", "_Test Company",
+		frappe.db.set_value("Company", "_Test Company", 
 			"exchange_gain_loss_account", "_Test Exchange Gain/Loss - _TC")
-		frappe.db.set_value("Company", "_Test Company", "write_off_account", "_Test Write Off - _TC")
-		frappe.db.set_value("Company", "_Test Company", "cost_center", "_Test Cost Center - _TC")
-
+		frappe.db.set_value("Company", "_Test Company", 
+			"write_off_account", "_Test Write Off - _TC")
+		frappe.db.set_value("Company", "_Test Company", 
+			"cost_center", "_Test Cost Center - _TC")
+		
 		so_inr = make_sales_order(currency="INR")
 		pr = make_payment_request(dt="Sales Order", dn=so_inr.name, recipient_id="saurabh@erpnext.com",
 			mute_email=1, submit_doc=1, return_doc=1)
@@ -80,15 +82,15 @@ class TestPaymentRequest(unittest.TestCase):
 
 		pr = make_payment_request(dt="Sales Invoice", dn=si_usd.name, recipient_id="saurabh@erpnext.com",
 			mute_email=1, payment_gateway="_Test Gateway - USD", submit_doc=1, return_doc=1)
-
+		
 		pe = pr.set_as_paid()
-
+		
 		expected_gle = dict((d[0], d) for d in [
 			["_Test Receivable USD - _TC", 0, 5000, si_usd.name],
 			[pr.payment_account, 6290.0, 0, None],
 			["_Test Exchange Gain/Loss - _TC", 0, 1290, None]
 		])
-
+		
 		gl_entries = 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""", pe.name, as_dict=1)

erpnext/accounts/doctype/payment_schedule/payment_schedule.json

@@ -1,197 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "", 
- "beta": 0, 
- "creation": "2017-08-10 15:38:00.080575", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "payment_term", 
-   "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": "Payment Term", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Payment Term", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "description", 
-   "fieldtype": "Small Text", 
-   "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": "Description", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "payment_term.description", 
-   "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": 2, 
-   "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": 1, 
-   "in_standard_filter": 0, 
-   "label": "Due Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "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": 2, 
-   "fieldname": "invoice_portion", 
-   "fieldtype": "Percent", 
-   "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": "Invoice Portion", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "payment_term.invoice_portion", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "payment_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": "Payment Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-12-19 16:20:33.546984", 
- "modified_by": "nabinhait@gmail.com", 
- "module": "Accounts", 
- "name": "Payment Schedule", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
-}

erpnext/accounts/doctype/payment_schedule/payment_schedule.py

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

erpnext/accounts/doctype/payment_term/payment_term.js

@@ -1,2 +0,0 @@
-// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt

erpnext/accounts/doctype/payment_term/payment_term.json

@@ -1,344 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "field:payment_term_name", 
- "beta": 0, 
- "creation": "2017-08-10 15:24:54.876365", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "payment_term_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": "Payment Term Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "invoice_portion", 
-   "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": "Invoice Portion", 
-   "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": "column_break_3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "due_date_based_on", 
-   "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": "Due Date Based On", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Day(s) after invoice date\nDay(s) after the end of the invoice month\nMonth(s) after the end of the invoice month", 
-   "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": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:in_list(['Day(s) after invoice date', 'Day(s) after the end of the invoice month'], doc.due_date_based_on)", 
-   "fieldname": "credit_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": "Credit Days", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.due_date_based_on=='Month(s) after the end of the invoice month'", 
-   "fieldname": "credit_months", 
-   "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": "Credit Months", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "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, 
-   "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": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "description", 
-   "fieldtype": "Small Text", 
-   "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": "Description", 
-   "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
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-01-24 11:13:42.800048", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Payment Term", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
-}

erpnext/accounts/doctype/payment_term/payment_term.py

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

erpnext/accounts/doctype/payment_term/test_payment_term.js

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

erpnext/accounts/doctype/payment_term/test_payment_term.py

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

erpnext/accounts/doctype/payment_term/test_records.json

@@ -1,34 +0,0 @@
-[
-  {
-    "doctype":"Payment Term",
-    "due_date_based_on":"Day(s) after invoice date",
-    "payment_term_name":"_Test N30",
-    "description":"_Test Net 30 Days",
-    "invoice_portion":50,
-    "credit_days":30
-  },
-  {
-    "doctype":"Payment Term",
-    "due_date_based_on":"Day(s) after invoice date",
-    "payment_term_name":"_Test COD",
-    "description":"_Test Cash on Delivery",
-    "invoice_portion":50,
-    "credit_days":0
-  },
-  {
-    "doctype":"Payment Term",
-    "due_date_based_on":"Month(s) after the end of the invoice month",
-    "payment_term_name":"_Test EONM",
-    "description":"_Test End of Next Month",
-    "invoice_portion":100,
-    "credit_months":1
-  },
-  {
-    "doctype":"Payment Term",
-    "due_date_based_on":"Day(s) after invoice date",
-    "payment_term_name":"_Test N30 1",
-    "description":"_Test Net 30 Days",
-    "invoice_portion":100,
-    "credit_days":30
-  }
-]

erpnext/accounts/doctype/payment_terms_template/payment_terms_template.js

@@ -1,12 +0,0 @@
-// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Payment Terms Template', {
-	setup: function(frm) {
-		frm.add_fetch("payment_term", "description", "description");
-		frm.add_fetch("payment_term", "invoice_portion", "invoice_portion");
-		frm.add_fetch("payment_term", "due_date_based_on", "due_date_based_on");
-		frm.add_fetch("payment_term", "credit_days", "credit_days");
-		frm.add_fetch("payment_term", "credit_months", "credit_months");
-	}
-});