Merge branch 'hotfix'

[Fix] Payment Entry currency symbol issue

README.md

@@ -8,7 +8,7 @@ Includes: Accounting, Inventory, Manufacturing, CRM, Sales, Purchase, Project Ma
 
 ERPNext is built on the [Frappe](https://github.com/frappe/frappe) Framework, a full-stack web app framework in Python & JavaScript.
 
-- [User Guide](https://manual.erpnext.com)
+- [User Guide](https://frappe.github.io/erpnext/)
 - [Getting Help](http://erpnext.org/getting-help.html)
 - [Discussion Forum](https://discuss.erpnext.com/)
 

erpnext/__init__.py

@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe
 
-__version__ = '7.0.46'
+__version__ = '7.2.20'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

erpnext/accounts/doctype/account/account.js

@@ -51,7 +51,7 @@ cur_frm.cscript.add_toolbar_buttons = function(doc) {
 
 	if (doc.is_group == 1) {
 		cur_frm.add_custom_button(__('Group to Non-Group'),
-			function() { cur_frm.cscript.convert_to_ledger(); }, 'icon-retweet', 'btn-default');
+			function() { cur_frm.cscript.convert_to_ledger(); }, 'fa fa-retweet', 'btn-default');
 	} else if (cint(doc.is_group) == 0) {
 		cur_frm.add_custom_button(__('Ledger'), function() {
 			frappe.route_options = {
@@ -64,7 +64,7 @@ cur_frm.cscript.add_toolbar_buttons = function(doc) {
 		});
 
 		cur_frm.add_custom_button(__('Non-Group to Group'),
-			function() { cur_frm.cscript.convert_to_group(); }, 'icon-retweet', 'btn-default')
+			function() { cur_frm.cscript.convert_to_group(); }, 'fa fa-retweet', 'btn-default')
 	}
 }
 

erpnext/accounts/doctype/account/account.json

@@ -9,11 +9,13 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "properties", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -21,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -29,6 +32,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -39,6 +43,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -46,12 +51,14 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -63,6 +70,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "account_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -70,6 +78,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Account Name", 
    "length": 0, 
    "no_copy": 1, 
@@ -79,6 +88,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -89,6 +99,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "0", 
    "fieldname": "is_group", 
    "fieldtype": "Check", 
@@ -97,6 +108,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -105,6 +117,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -115,6 +128,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -122,6 +136,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -132,6 +147,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 1, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -142,6 +158,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "root_type", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -149,6 +166,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Root Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -157,6 +175,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -167,6 +186,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "report_type", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -174,6 +194,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Report Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -182,6 +203,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -192,6 +214,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.is_group==0", 
    "fieldname": "account_currency", 
    "fieldtype": "Link", 
@@ -200,6 +223,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -209,6 +233,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -219,6 +244,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -226,12 +252,14 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -243,6 +271,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "parent_account", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -250,6 +279,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Parent Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -260,6 +290,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 1, 
@@ -270,6 +301,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Setting Account Type helps in selecting this Account in transactions.", 
    "fieldname": "account_type", 
    "fieldtype": "Select", 
@@ -278,6 +310,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Account Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -288,6 +321,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -298,6 +332,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Rate at which this tax is applied", 
    "fieldname": "tax_rate", 
    "fieldtype": "Float", 
@@ -306,6 +341,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -315,6 +351,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -325,6 +362,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "If the account is frozen, entries are allowed to restricted users.", 
    "fieldname": "freeze_account", 
    "fieldtype": "Select", 
@@ -333,6 +371,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Frozen", 
    "length": 0, 
    "no_copy": 0, 
@@ -343,6 +382,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -353,6 +393,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "warehouse", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -360,6 +401,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -368,6 +410,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -378,6 +421,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "balance_must_be", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -385,6 +429,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Balance must be", 
    "length": 0, 
    "no_copy": 0, 
@@ -393,6 +438,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -403,6 +449,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "lft", 
    "fieldtype": "Int", 
    "hidden": 1, 
@@ -410,6 +457,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Lft", 
    "length": 0, 
    "no_copy": 0, 
@@ -417,6 +465,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -427,6 +476,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "rgt", 
    "fieldtype": "Int", 
    "hidden": 1, 
@@ -434,6 +484,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rgt", 
    "length": 0, 
    "no_copy": 0, 
@@ -441,6 +492,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -451,6 +503,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "old_parent", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -458,6 +511,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Old Parent", 
    "length": 0, 
    "no_copy": 0, 
@@ -465,6 +519,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -474,7 +529,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-money", 
+ "icon": "fa fa-money", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
@@ -483,7 +538,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-06-24 13:33:45.504882", 
+ "modified": "2016-12-15 14:43:50.121671", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Account", 
@@ -499,6 +554,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -519,6 +575,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -539,6 +596,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -559,6 +617,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -579,6 +638,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 

erpnext/accounts/doctype/account/account.py

@@ -171,7 +171,7 @@ class Account(Document):
 				
 			old_warehouse = cstr(frappe.db.get_value("Account", self.name, "warehouse"))
 			if old_warehouse != cstr(self.warehouse):
-				if old_warehouse:
+				if old_warehouse and frappe.db.exists("Warehouse", old_warehouse):
 					self.validate_warehouse(old_warehouse)
 				if self.warehouse:
 					self.validate_warehouse(self.warehouse)

erpnext/accounts/doctype/account/account_tree.js

@@ -1,3 +1,5 @@
+frappe.provide("frappe.treeview_settings")
+
 frappe.treeview_settings["Account"] = {
 	breadcrumbs: "Accounts",
 	title: __("Chart Of Accounts"),
@@ -25,18 +27,30 @@ frappe.treeview_settings["Account"] = {
 		{fieldtype:'Check', fieldname:'is_group', label:__('Is Group'),
 			description: __('Further accounts can be made under Groups, but entries can be made against non-Groups')},
 		{fieldtype:'Select', fieldname:'root_type', label:__('Root Type'),
-			options: ['Asset', 'Liability', 'Equity', 'Income', 'Expense'].join('\n')},
+			options: ['Asset', 'Liability', 'Equity', 'Income', 'Expense'].join('\n'),
+			depends_on: 'eval:doc.is_group && !doc.parent_account'},
 		{fieldtype:'Select', fieldname:'account_type', label:__('Account Type'),
-			options: ['', 'Bank', 'Cash', 'Stock', 'Tax', 'Chargeable', 'Fixed Asset'].join('\n'),
+			options: ['', 'Accumulated Depreciation', 'Bank', 'Cash', 'Chargeable', 'Cost of Goods Sold', 'Depreciation',
+				'Equity', 'Expense Account', 'Expenses Included In Valuation', 'Fixed Asset', 'Income Account', 'Payable', 'Receivable',
+				'Round Off', 'Stock', 'Stock Adjustment', 'Stock Received But Not Billed', 'Tax', 'Temporary'].join('\n'),
 			description: __("Optional. This setting will be used to filter in various transactions.")
 		},
 		{fieldtype:'Float', fieldname:'tax_rate', label:__('Tax Rate'),
-			depends_on: 'eval:doc.is_group==1&&doc.account_type=="Tax"'},
+			depends_on: 'eval:doc.is_group==0&&doc.account_type=="Tax"'},
 		{fieldtype:'Link', fieldname:'warehouse', label:__('Warehouse'), options:"Warehouse",
-			depends_on: 'eval:(!doc.is_group&&doc.account_type=="Warehouse")'},
+			depends_on: 'eval:(!doc.is_group&&doc.account_type=="Stock")',
+			get_query: function() {
+				return {
+					filters:{
+						"company": frappe.treeview_settings.filters["company"]
+					}
+				}
+			}
+		},
 		{fieldtype:'Link', fieldname:'account_currency', label:__('Currency'), options:"Currency",
 			description: __("Optional. Sets company's default currency, if not specified.")}
 	],
+	ignore_fields:["parent_account"],
 	onrender: function(node) {
 		var dr_or_cr = node.data.balance < 0 ? "Cr" : "Dr";
 		if (node.data && node.data.balance!==undefined) {
@@ -48,5 +62,24 @@ frappe.treeview_settings["Account"] = {
 				+ " " + dr_or_cr
 				+ '</span>').insertBefore(node.$ul);
 		}
-	}
-}
+	},
+	toolbar: [
+		{
+			condition: function(node) {
+				return !node.root && frappe.boot.user.can_read.indexOf("GL Entry") !== -1
+			},
+			label: __("View Ledger"),
+			click: function(node, btn) {
+				frappe.route_options = {
+					"account": node.label,
+					"from_date": sys_defaults.year_start_date,
+					"to_date": sys_defaults.year_end_date,
+					"company": frappe.defaults.get_default('company') ? frappe.defaults.get_default('company'): ""
+				};
+				frappe.set_route("query-report", "General Ledger");
+			},
+			btnClass: "hidden-xs"
+		}
+	],
+	extend_toolbar: true
+}

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

@@ -6,9 +6,8 @@ import frappe, os, json
 from frappe.utils import cstr
 from unidecode import unidecode
 
-def create_charts(chart_name, company):
-	chart = get_chart(chart_name)
-	
+def create_charts(company, chart_template=None, existing_company=None):
+	chart = get_chart(chart_template, existing_company)
 	if chart:
 		accounts = []
 
@@ -17,7 +16,7 @@ def create_charts(chart_name, company):
 				if root_account:
 					root_type = child.get("root_type")
 
-				if account_name not in ["account_type", "root_type", "is_group"]:
+				if account_name not in ["account_type", "root_type", "is_group", "tax_rate"]:
 
 					account_name_in_db = unidecode(account_name.strip().lower())
 					if account_name_in_db in accounts:
@@ -57,16 +56,19 @@ def create_charts(chart_name, company):
 def identify_is_group(child):
 	if child.get("is_group"):
 		is_group = child.get("is_group")
-	elif len(set(child.keys()) - set(["account_type", "root_type", "is_group"])):
+	elif len(set(child.keys()) - set(["account_type", "root_type", "is_group", "tax_rate"])):
 		is_group = 1
 	else:
 		is_group = 0
 
 	return is_group
 
-def get_chart(chart_name):
+def get_chart(chart_template, existing_company=None):
 	chart = {}
-	if chart_name == "Standard":
+	if existing_company:
+		return get_account_tree_from_existing_company(existing_company)
+	
+	elif chart_template == "Standard":
 		from erpnext.accounts.doctype.account.chart_of_accounts.verified import standard_chart_of_accounts
 		return standard_chart_of_accounts.get()
 	else:
@@ -79,7 +81,7 @@ def get_chart(chart_name):
 				if fname.endswith(".json"):
 					with open(os.path.join(path, fname), "r") as f:
 						chart = f.read()
-						if chart and json.loads(chart).get("name") == chart_name:
+						if chart and json.loads(chart).get("name") == chart_template:
 							return json.loads(chart).get("tree")
 
 @frappe.whitelist()
@@ -103,7 +105,7 @@ def get_charts_for_country(country):
 			path = os.path.join(os.path.dirname(__file__), folder)
 
 			for fname in os.listdir(path):
-				if fname.startswith(country_code) and fname.endswith(".json"):
+				if (fname.startswith(country_code) or fname.startswith(country)) and fname.endswith(".json"):
 					with open(os.path.join(path, fname), "r") as f:
 						_get_chart_name(f.read())
 
@@ -111,3 +113,47 @@ def get_charts_for_country(country):
 		charts.append("Standard")
 
 	return charts
+
+
+def get_account_tree_from_existing_company(existing_company):
+	all_accounts = frappe.get_all('Account', 
+		filters={'company': existing_company}, 
+		fields = ["name", "account_name", "parent_account", "account_type", 
+			"is_group", "root_type", "tax_rate"], 
+		order_by="lft, rgt")
+	
+	account_tree = {}
+
+	# fill in tree starting with root accounts (those with no parent)
+	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 None
+	children  = [acc for acc in all_accounts if acc.parent_account == parent_account]
+			
+	# if no children, but a group account
+	if not children and parent.is_group:
+		tree["is_group"] = 1
+
+	# build a subtree for each child
+	for child in children:
+		if child.account_type == "Stock" and not child.is_group:
+			tree["is_group"] = 1
+			continue
+		
+		# start new subtree
+		tree[child.account_name] = {}
+		
+		# assign account_type and root_type
+		if child.account_type:
+			tree[child.account_name]["account_type"] = child.account_type
+		if child.tax_rate:
+			tree[child.account_name]["tax_rate"] = child.tax_rate
+		if not parent:
+			tree[child.account_name]["root_type"] = child.root_type
+			
+		# call recursively to build a subtree for current account
+		build_account_tree(tree[child.account_name], child, all_accounts)

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,99 @@
+{
+    "country_code": "fr", 
+    "name": "France - Chart of Accounts", 
+    "tree": {
+        "Frais": {
+            "601 achats stock\u00e9s, mat premi\u00e8res": {
+                "account_type": "Cost of Goods Sold"
+            }, 
+            "6031 variation des stock\u00e9s mat premi\u00e8res": {
+                "account_type": "Stock Adjustment"
+            }, 
+            "6081 frais accessoires d'achats mat premi\u00e8res": {
+                "account_type": "Expenses Included In Valuation"
+            }, 
+            "Dotations aux amortissements, d\u00e9pr\u00e9ciations": {
+                "account_type": "Depreciation"
+            }, 
+            "root_type": "Expense"
+        }, 
+        "le revenu": {
+            "701 ventes de produits finis": {}, 
+            "root_type": "Income"
+        }, 
+        "les atouts": {
+            "Amortissements des immobilisations corporelles ": {
+                "Autres immobilisations corporelles (m\u00eame ventilation que celle du compte 218)": {
+                    "account_type": "Accumulated Depreciation"
+                }, 
+                "Constructions (m\u00eame ventilation que celle du compte 213) ": {
+                    "account_type": "Accumulated Depreciation"
+                }, 
+                "Installations mat\u00e9riel et outillage industriels (m\u00eame ventilation que celle du compte 215)": {
+                    "account_type": "Accumulated Depreciation"
+                }, 
+                "account_type": "Accumulated Depreciation"
+            }, 
+            "Banques": {
+                "51201 Soci\u00e9t\u00e9 g\u00e9n\u00e9rale": {
+                    "account_type": "Bank"
+                }, 
+                "account_type": "Bank"
+            }, 
+            "Caisse": {
+                "5301 Caisse si\u00e8ge social": {
+                    "account_type": "Cash"
+                }, 
+                "account_type": "Cash"
+            }, 
+            "Clients et comptes rattach\u00e9s": {
+                "41119 Autres Clients": {
+                    "account_type": "Receivable"
+                }, 
+                "account_type": "Receivable"
+            }, 
+            "Immobilisations corporelles en cours": {
+                "Autres immobilisations corporelles": {
+                    "account_type": "Fixed Asset"
+                }, 
+                "Constructions": {
+                    "account_type": "Fixed Asset"
+                }, 
+                "Installations techniques mat\u00e9riel et outillage industriels ": {
+                    "account_type": "Fixed Asset"
+                }, 
+                "account_type": "Fixed Asset"
+            }, 
+            "Stock": {
+                "account_type": "Stock", 
+                "is_group": 1
+            }, 
+            "root_type": "Asset"
+        }, 
+        "passifs": {
+            "Fournisseurs - Factures non parvenues ": {
+                "4081 Fournisseurs - Factures non parvenues ": {
+                    "account_type": "Stock Received But Not Billed"
+                }, 
+                "account_type": "Stock Received But Not Billed"
+            }, 
+            "Fournisseurs et comptes rattach\u00e9s": {
+                "4011 Fournisseurs - Achats de biens et prestations de services": {
+                    "account_type": "Payable"
+                }, 
+                "account_type": "Payable"
+            }, 
+            "root_type": "Liability", 
+            "\u00c9tat - Taxes sur le chiffre d'affaires": {
+                "TVA collect\u00e9e (Taux Normal)": {
+                    "account_type": "Tax"
+                }, 
+                "account_type": "Tax"
+            }
+        }, 
+        "\u00c9quit\u00e9": {
+            "is_group": 1, 
+            "root_type": "Equity"
+        }
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -28,7 +28,8 @@
 					},
 					"Petty Cash": {
 						"account_type": "Cash"
-					}
+					},
+					"account_type": "Cash"
 				},
 				"Loans and Advances-Assets": {
 					"Prepayments": {}
@@ -49,29 +50,73 @@
 			"Non-current assets": {
 				"Fixed Assets": {
 					"Accumulated Depreciation": {
-						"AccDep-Equipment-AV": {},
-						"AccDep-Equipment-Bar": {},
-						"AccDep-Equipment-ICT": {},
-						"AccDep-Equipment-Electrical": {},
-						"AccDep-Furniture and Fixtures": {},
-						"AccDep-Equipment-Kitchen": {},
-						"AccDep-Equipment-Lighting": {},
-						"AccDep-Equipment-Office": {},
-						"AccDep-Motor Vehicle": {},
-						"AccDep-Plant and Machinery": {},
-						"AccDep-Renovation": {}
+						"AccDep-Equipment-AV": {
+							"account_type": "Accumulated Depreciation"
+						},
+						"AccDep-Equipment-Bar": {
+							"account_type": "Accumulated Depreciation"
+						},
+						"AccDep-Equipment-ICT": {
+							"account_type": "Accumulated Depreciation"
+						},
+						"AccDep-Equipment-Electrical": {
+							"account_type": "Accumulated Depreciation"
+						},
+						"AccDep-Furniture and Fixtures": {
+							"account_type": "Accumulated Depreciation"
+						},
+						"AccDep-Equipment-Kitchen": {
+							"account_type": "Accumulated Depreciation"
+						},
+						"AccDep-Equipment-Lighting": {
+							"account_type": "Accumulated Depreciation"
+						},
+						"AccDep-Equipment-Office": {
+							"account_type": "Accumulated Depreciation"
+						},
+						"AccDep-Motor Vehicle": {
+							"account_type": "Accumulated Depreciation"
+						},
+						"AccDep-Plant and Machinery": {
+							"account_type": "Accumulated Depreciation"
+						},
+						"AccDep-Renovation": {
+							"account_type": "Accumulated Depreciation"
+						}
 					},
-					"Equipment-AV": {},
-					"Equipment-Bar": {},
-					"Equipment-ICT": {},
-					"Equipment-Electrical": {},
-					"Furniture and Fixtures": {},
-					"Equipment-Kitchen": {},
-					"Equipment-Lighting": {},
-					"Equipment-Office": {},
-					"Motor Vehicle": {},
-					"Plant and Machinery": {},
-					"Renovation": {}
+					"Equipment-AV": {
+						"account_type": "Fixed Asset"
+					},
+					"Equipment-Bar": {
+						"account_type": "Fixed Asset"
+					},
+					"Equipment-ICT": {
+						"account_type": "Fixed Asset"
+					},
+					"Equipment-Electrical": {
+						"account_type": "Fixed Asset"
+					},
+					"Furniture and Fixtures": {
+						"account_type": "Fixed Asset"
+					},
+					"Equipment-Kitchen": {
+						"account_type": "Fixed Asset"
+					},
+					"Equipment-Lighting": {
+						"account_type": "Fixed Asset"
+					},
+					"Equipment-Office": {
+						"account_type": "Fixed Asset"
+					},
+					"Motor Vehicle": {
+						"account_type": "Fixed Asset"
+					},
+					"Plant and Machinery": {
+						"account_type": "Fixed Asset"
+					},
+					"Renovation": {
+						"account_type": "Fixed Asset"
+					}
 				},
 				"Non-Fixed Assets": {
 					"Goodwill": {},
@@ -292,22 +337,46 @@
 			"Expenses-Other": {
 				"Bad Debts Written Off": {},
 				"Depreciation": {
-					"Dep-AV Equipment": {},
-					"Dep-Bar Equipment": {},
-					"Dep-ICT Equipment": {},
-					"Dep-Electrical Equipment": {},
-					"Dep-Fixtures & Furniture": {},
-					"Dep-Kitchen Equipment": {},
-					"Dep-Lighting Equipment": {},
-					"Dep-Motor Vehicle": {},
-					"Dep-Office Equipment": {},
-					"Dep-Plant & Machinery": {},
-					"Dep-Renovation": {}
+					"Dep-AV Equipment": {
+						 "account_type": "Depreciation"
+					},
+					"Dep-Bar Equipment": {
+						 "account_type": "Depreciation"
+					},
+					"Dep-ICT Equipment": {
+						 "account_type": "Depreciation"
+					},
+					"Dep-Electrical Equipment": {
+						 "account_type": "Depreciation"
+					},
+					"Dep-Fixtures & Furniture": {
+						 "account_type": "Depreciation"
+					},
+					"Dep-Kitchen Equipment": {
+						 "account_type": "Depreciation"
+					},
+					"Dep-Lighting Equipment": {
+						 "account_type": "Depreciation"
+					},
+					"Dep-Motor Vehicle": {
+						 "account_type": "Depreciation"
+					},
+					"Dep-Office Equipment": {
+						 "account_type": "Depreciation"
+					},
+					"Dep-Plant & Machinery": {
+						 "account_type": "Depreciation"
+					},
+					"Dep-Renovation": {
+						 "account_type": "Depreciation"
+					}
 				},
 				"Donations": {},
-				"Round Off": {},
+				"Round Off": {
+					"account_type": "Round Off"
+				},
 				"Tax Expenses": {
-					"Tax Expenses": {}
+					"is_group": 1
 				}
 			},
 			"Expenses-Staff": {

erpnext/accounts/doctype/accounts_settings/accounts_settings.json

@@ -10,11 +10,13 @@
  "doctype": "DocType", 
  "document_type": "Other", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "1", 
    "description": "If enabled, the system will post accounting entries for inventory automatically.", 
    "fieldname": "auto_accounting_for_stock", 
@@ -41,6 +43,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.", 
    "fieldname": "acc_frozen_upto", 
    "fieldtype": "Date", 
@@ -66,6 +69,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts", 
    "fieldname": "frozen_accounts_modifier", 
    "fieldtype": "Link", 
@@ -92,6 +96,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_4", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -116,6 +121,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Role that is allowed to submit transactions that exceed credit limits set.", 
    "fieldname": "credit_controller", 
    "fieldtype": "Link", 
@@ -142,6 +148,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "check_supplier_invoice_uniqueness", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -162,11 +169,64 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "make_payment_via_journal_entry", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Make Payment via Journal Entry", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "1", 
+   "fieldname": "unlink_payment_on_cancellation_of_invoice", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Unlink Payment on Cancellation of Invoice", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
   }
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-cog", 
+ "icon": "fa fa-cog", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
@@ -175,7 +235,7 @@
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-14 14:32:06.056888", 
+ "modified": "2016-10-20 16:12:38.595075", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Accounts Settings", 
@@ -191,6 +251,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 

erpnext/accounts/doctype/asset/asset.js

@@ -28,6 +28,7 @@ frappe.ui.form.on('Asset', {
 	refresh: function(frm) {
 		frappe.ui.form.trigger("Asset", "is_existing_asset");
 		frm.toggle_display("next_depreciation_date", frm.doc.docstatus < 1);
+		frm.events.make_schedules_editable(frm);
 				
 		if (frm.doc.docstatus==1) {
 			if (frm.doc.status=='Submitted' && !frm.doc.is_existing_asset && !frm.doc.purchase_invoice) {
@@ -141,6 +142,22 @@ frappe.ui.form.on('Asset', {
 		frm.toggle_enable("supplier", frm.doc.is_existing_asset);
 		frm.toggle_reqd("next_depreciation_date", !frm.doc.is_existing_asset);
 	},
+	
+	opening_accumulated_depreciation: function(frm) {
+		erpnext.asset.set_accululated_depreciation(frm);
+	},
+	
+	depreciation_method: function(frm) {
+		frm.events.make_schedules_editable(frm);
+	},
+	
+	make_schedules_editable: function(frm) {
+		var is_editable = frm.doc.depreciation_method==="Manual" ? true : false;
+		frm.toggle_enable("schedules", is_editable);
+		frm.fields_dict["schedules"].grid.toggle_enable("schedule_date", is_editable);
+		frm.fields_dict["schedules"].grid.toggle_enable("depreciation_amount", is_editable);
+	}
+	
 });
 
 frappe.ui.form.on('Depreciation Schedule', {
@@ -159,9 +176,25 @@ frappe.ui.form.on('Depreciation Schedule', {
 				}
 			})
 		}
+	},
+	
+	depreciation_amount: function(frm, cdt, cdn) {
+		erpnext.asset.set_accululated_depreciation(frm);
 	}
+
 })
 
+erpnext.asset.set_accululated_depreciation = function(frm) {
+	if(frm.doc.depreciation_method != "Manual") return;
+	
+	accumulated_depreciation = flt(frm.doc.opening_accumulated_depreciation);
+	$.each(frm.doc.schedules || [], function(i, row) {
+		accumulated_depreciation  += flt(row.depreciation_amount);
+		frappe.model.set_value(row.doctype, row.name, 
+			"accumulated_depreciation_amount", accumulated_depreciation);
+	})
+}
+
 erpnext.asset.make_purchase_invoice = function(frm) {
 	frappe.call({
 		args: {

erpnext/accounts/doctype/asset/asset.json

@@ -9,11 +9,13 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Document", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "asset_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -21,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Asset Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -29,6 +32,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -39,6 +43,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item_code", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -46,6 +51,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -55,6 +61,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -65,6 +72,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "asset_category", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -72,6 +80,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Asset Category", 
    "length": 0, 
    "no_copy": 0, 
@@ -81,6 +90,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -91,6 +101,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Draft", 
    "fieldname": "status", 
    "fieldtype": "Select", 
@@ -99,6 +110,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -108,6 +120,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -118,6 +131,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "image", 
    "fieldtype": "Attach Image", 
    "hidden": 1, 
@@ -125,6 +139,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image", 
    "length": 0, 
    "no_copy": 1, 
@@ -133,6 +148,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -143,6 +159,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -150,6 +167,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -157,6 +175,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -167,6 +186,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -174,6 +194,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -183,6 +204,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 1, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -193,6 +215,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "warehouse", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -200,6 +223,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -209,6 +233,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -219,6 +244,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "is_existing_asset", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -226,6 +252,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Existing Asset", 
    "length": 0, 
    "no_copy": 0, 
@@ -234,6 +261,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -244,6 +272,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "purchase_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -251,6 +280,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Purchase Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -259,6 +289,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -269,6 +300,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "supplier", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -276,6 +308,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier", 
    "length": 0, 
    "no_copy": 0, 
@@ -285,6 +318,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -295,6 +329,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "purchase_invoice", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -302,6 +337,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Purchase Invoice", 
    "length": 0, 
    "no_copy": 1, 
@@ -311,6 +347,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -321,6 +358,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "disposal_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -328,6 +366,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Disposal Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -336,6 +375,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -346,6 +386,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "journal_entry_for_scrap", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -353,6 +394,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Journal Entry for Scrap", 
    "length": 0, 
    "no_copy": 1, 
@@ -362,6 +404,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -372,6 +415,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_5", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -379,6 +423,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -386,6 +431,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -396,6 +442,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "gross_purchase_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -403,6 +450,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Gross Purchase Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -412,6 +460,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -422,6 +471,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "expected_value_after_useful_life", 
    "fieldtype": "Currency", 
@@ -430,6 +480,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Expected Value After Useful Life", 
    "length": 0, 
    "no_copy": 0, 
@@ -439,6 +490,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -449,6 +501,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "is_existing_asset", 
    "fieldname": "opening_accumulated_depreciation", 
    "fieldtype": "Currency", 
@@ -457,6 +510,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Opening Accumulated Depreciation", 
    "length": 0, 
    "no_copy": 1, 
@@ -466,6 +520,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -476,13 +531,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "value_after_depreciation", 
    "fieldtype": "Currency", 
-   "hidden": 0, 
+   "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Value After Depreciation", 
    "length": 0, 
    "no_copy": 0, 
@@ -492,6 +549,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -502,6 +560,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_11", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -509,6 +568,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -516,6 +576,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -526,6 +587,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "", 
    "depends_on": "", 
    "fieldname": "depreciation_method", 
@@ -535,15 +597,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Depreciation Method", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "\nStraight Line\nDouble Declining Balance", 
+   "options": "\nStraight Line\nDouble Declining Balance\nManual", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -554,6 +618,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_number_of_depreciations", 
    "fieldtype": "Int", 
    "hidden": 0, 
@@ -561,6 +626,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Number of Depreciations", 
    "length": 0, 
    "no_copy": 0, 
@@ -569,6 +635,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -579,6 +646,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:(doc.is_existing_asset && doc.opening_accumulated_depreciation)", 
    "fieldname": "number_of_depreciations_booked", 
    "fieldtype": "Int", 
@@ -587,6 +655,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Number of Depreciations Booked", 
    "length": 0, 
    "no_copy": 1, 
@@ -595,6 +664,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -605,6 +675,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "frequency_of_depreciation", 
    "fieldtype": "Int", 
    "hidden": 0, 
@@ -612,6 +683,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Frequency of Depreciation (Months)", 
    "length": 0, 
    "no_copy": 0, 
@@ -620,6 +692,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -630,6 +703,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "next_depreciation_date", 
    "fieldtype": "Date", 
@@ -638,6 +712,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Next Depreciation Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -646,6 +721,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -656,6 +732,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_14", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -663,6 +740,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Depreciation Schedule", 
    "length": 0, 
    "no_copy": 0, 
@@ -671,6 +749,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -681,6 +760,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "schedules", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -688,6 +768,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Depreciation Schedules", 
    "length": 0, 
    "no_copy": 1, 
@@ -696,7 +777,8 @@
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 1, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -707,6 +789,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -714,6 +797,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -722,6 +806,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -740,7 +825,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-05 12:54:38.585259", 
+ "modified": "2016-11-18 15:59:19.774500", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Asset", 
@@ -757,6 +842,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 

erpnext/accounts/doctype/asset/asset.py

@@ -18,6 +18,7 @@ class Asset(Document):
 		self.set_missing_values()
 		self.validate_asset_values()
 		self.make_depreciation_schedule()
+		self.set_accumulated_depreciation()
 		self.validate_expected_value_after_useful_life()
 		# Validate depreciation related accounts
 		get_depreciation_accounts(self)
@@ -48,7 +49,7 @@ class Asset(Document):
 			for field, value in item_details.items():
 				if not self.get(field):
 					self.set(field, value)
-					
+
 		self.value_after_depreciation = (flt(self.gross_purchase_amount) - 
 			flt(self.opening_accumulated_depreciation))
 
@@ -87,9 +88,10 @@ class Asset(Document):
 				frappe.throw(_("Please set Next Depreciation Date"))
 
 	def make_depreciation_schedule(self):
-		self.schedules = []
+		if self.depreciation_method != 'Manual':
+			self.schedules = []
+			
 		if not self.get("schedules") and self.next_depreciation_date:
-			accumulated_depreciation = flt(self.opening_accumulated_depreciation)
 			value_after_depreciation = flt(self.value_after_depreciation)
 			
 			number_of_pending_depreciations = cint(self.total_number_of_depreciations) - \
@@ -100,18 +102,21 @@ class Asset(Document):
 						n * cint(self.frequency_of_depreciation))
 
 					depreciation_amount = self.get_depreciation_amount(value_after_depreciation)
-				
-					accumulated_depreciation += flt(depreciation_amount)
 					value_after_depreciation -= flt(depreciation_amount)
 
 					self.append("schedules", {
 						"schedule_date": schedule_date,
-						"depreciation_amount": depreciation_amount,
-						"accumulated_depreciation_amount": accumulated_depreciation
+						"depreciation_amount": depreciation_amount
 					})
+					
+	def set_accumulated_depreciation(self):
+		accumulated_depreciation = flt(self.opening_accumulated_depreciation)
+		for d in self.get("schedules"):
+			accumulated_depreciation  += flt(d.depreciation_amount)
+			d.accumulated_depreciation_amount = accumulated_depreciation
 
 	def get_depreciation_amount(self, depreciable_value):
-		if self.depreciation_method == "Straight Line":
+		if self.depreciation_method in ("Straight Line", "Manual"):
 			depreciation_amount = (flt(self.value_after_depreciation) -
 				flt(self.expected_value_after_useful_life)) / (cint(self.total_number_of_depreciations) - 
 				cint(self.number_of_depreciations_booked))
@@ -126,16 +131,15 @@ class Asset(Document):
 		return depreciation_amount
 		
 	def validate_expected_value_after_useful_life(self):
-		if self.depreciation_method == "Double Declining Balance":
-			accumulated_depreciation_after_full_schedule = \
-				max([d.accumulated_depreciation_amount for d in self.get("schedules")])
-			
-			asset_value_after_full_schedule = (flt(self.gross_purchase_amount) - 
-				flt(accumulated_depreciation_after_full_schedule))
-			
-			if self.expected_value_after_useful_life < asset_value_after_full_schedule:
-				frappe.throw(_("Expected value after useful life must be greater than or equal to {0}")
-					.format(asset_value_after_full_schedule))
+		accumulated_depreciation_after_full_schedule = \
+			max([d.accumulated_depreciation_amount for d in self.get("schedules")])
+		
+		asset_value_after_full_schedule = (flt(self.gross_purchase_amount) - 
+			flt(accumulated_depreciation_after_full_schedule))
+		
+		if self.expected_value_after_useful_life < asset_value_after_full_schedule:
+			frappe.throw(_("Expected value after useful life must be greater than or equal to {0}")
+				.format(asset_value_after_full_schedule))
 
 	def validate_cancellation(self):
 		if self.status not in ("Submitted", "Partially Depreciated", "Fully Depreciated"):

erpnext/accounts/doctype/asset/test_asset.py

@@ -119,6 +119,30 @@ class TestAsset(unittest.TestCase):
 			for d in asset.get("schedules")]
 
 		self.assertEqual(schedules, expected_schedules)
+		
+	def test_schedule_for_manual_method(self):
+		asset = frappe.get_doc("Asset", "Macbook Pro 1")
+		asset.depreciation_method = "Manual"
+		asset.schedules = []
+		for schedule_date, amount in [["2020-12-31", 40000], ["2021-06-30", 30000], ["2021-10-31", 20000]]:
+			asset.append("schedules", {
+				"schedule_date": schedule_date,
+				"depreciation_amount": amount
+			})
+		asset.save()
+
+		self.assertEqual(asset.status, "Draft")
+
+		expected_schedules = [
+			["2020-12-31", 40000, 40000],
+			["2021-06-30", 30000, 70000],
+			["2021-10-31", 20000, 90000]
+		]
+
+		schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
+			for d in asset.get("schedules")]
+
+		self.assertEqual(schedules, expected_schedules)
 
 	def test_depreciation(self):
 		asset = frappe.get_doc("Asset", "Macbook Pro 1")

erpnext/accounts/doctype/asset_category/asset_category.js

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

erpnext/accounts/doctype/asset_category/asset_category.json

@@ -3,16 +3,20 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:asset_category_name", 
+ "beta": 0, 
  "creation": "2016-03-01 17:41:39.778765", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Document", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "asset_category_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -20,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Asset Category Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -28,6 +33,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -38,6 +44,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Straight Line", 
    "fieldname": "depreciation_method", 
    "fieldtype": "Select", 
@@ -46,6 +53,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Depreciation Method", 
    "length": 0, 
    "no_copy": 0, 
@@ -55,6 +63,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -65,6 +74,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -72,6 +82,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -79,6 +90,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -89,6 +101,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_number_of_depreciations", 
    "fieldtype": "Int", 
    "hidden": 0, 
@@ -96,6 +109,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Number of Depreciations", 
    "length": 0, 
    "no_copy": 0, 
@@ -104,6 +118,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -114,6 +129,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "frequency_of_depreciation", 
    "fieldtype": "Int", 
    "hidden": 0, 
@@ -121,6 +137,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Frequency of Depreciation (Months)", 
    "length": 0, 
    "no_copy": 0, 
@@ -129,6 +146,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -139,6 +157,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_2", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -146,6 +165,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Accounts", 
    "length": 0, 
    "no_copy": 0, 
@@ -154,6 +174,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -164,6 +185,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "accounts", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -171,6 +193,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Accounts", 
    "length": 0, 
    "no_copy": 0, 
@@ -180,6 +203,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -190,13 +214,14 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 0, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-04-20 13:23:09.890324", 
+ "modified": "2016-11-07 05:49:42.600981", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Asset Category", 
@@ -213,6 +238,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -233,6 +259,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 

erpnext/accounts/doctype/asset_category_account/asset_category_account.json

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

erpnext/accounts/doctype/asset_movement/asset_movement.json

@@ -3,16 +3,19 @@
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "AM-.#####", 
+ "beta": 0, 
  "creation": "2016-04-25 18:00:23.559973", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "asset", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -20,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Asset", 
    "length": 0, 
    "no_copy": 0, 
@@ -29,6 +33,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -39,6 +44,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "transaction_date", 
    "fieldtype": "Datetime", 
    "hidden": 0, 
@@ -46,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Transaction Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -54,6 +61,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -64,6 +72,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -71,6 +80,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -80,6 +90,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 1, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -90,6 +101,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_4", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -97,6 +109,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -104,6 +117,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -114,6 +128,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "source_warehouse", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -121,6 +136,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Source Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -130,6 +146,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -140,6 +157,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "target_warehouse", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -147,6 +165,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Target Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -156,6 +175,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -166,6 +186,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -173,6 +194,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -181,6 +203,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -191,13 +214,14 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 0, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-04-25 19:14:08.853429", 
+ "modified": "2016-11-07 05:49:47.558549", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Asset Movement", 
@@ -214,6 +238,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -234,6 +259,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -254,6 +280,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 

erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js

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

erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json

@@ -234,7 +234,7 @@
  ], 
  "hide_heading": 1, 
  "hide_toolbar": 1, 
- "icon": "icon-check", 
+ "icon": "fa fa-check", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 

erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py

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

erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json

@@ -13,6 +13,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "payment_document", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -39,6 +40,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 1, 
    "fieldname": "payment_entry", 
    "fieldtype": "Dynamic Link", 
    "hidden": 0, 
@@ -67,6 +69,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "against_account", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -94,8 +97,9 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "amount", 
-   "fieldtype": "Currency", 
+   "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -106,7 +110,7 @@
    "no_copy": 0, 
    "oldfieldname": "debit", 
    "oldfieldtype": "Currency", 
-   "options": "account_currency", 
+   "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -121,6 +125,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_5", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -146,6 +151,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "posting_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -172,6 +178,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 1, 
    "fieldname": "cheque_number", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -198,6 +205,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "cheque_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -224,6 +232,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "clearance_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -258,7 +267,7 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-07-11 03:27:58.139117", 
+ "modified": "2016-11-17 11:39:00.308624", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Bank Reconciliation Detail", 

erpnext/accounts/doctype/budget/budget.js

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

erpnext/accounts/doctype/budget/budget.json

@@ -14,48 +14,26 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "cost_center", 
-   "fieldtype": "Link", 
+   "columns": 0, 
+   "default": "Cost Center", 
+   "fieldname": "budget_against", 
+   "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Cost Center", 
+   "in_standard_filter": 1, 
+   "label": "Budget Against", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Cost Center", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "fiscal_year", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Fiscal Year", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Fiscal Year", 
+   "options": "\nCost Center\nProject", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -66,6 +44,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -73,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -82,6 +62,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -92,6 +73,96 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.budget_against == 'Cost Center'", 
+   "fieldname": "cost_center", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "label": "Cost Center", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.budget_against == 'Project'", 
+   "fieldname": "project", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "label": "Project", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Project", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "fiscal_year", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "label": "Fiscal Year", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Fiscal Year", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -99,6 +170,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -106,6 +178,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -116,6 +189,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Stop", 
    "fieldname": "action_if_annual_budget_exceeded", 
    "fieldtype": "Select", 
@@ -124,6 +198,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Action if Annual Budget Exceeded", 
    "length": 0, 
    "no_copy": 0, 
@@ -133,6 +208,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -143,6 +219,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Warn", 
    "description": "", 
    "fieldname": "action_if_accumulated_monthly_budget_exceeded", 
@@ -152,6 +229,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Action if Accumulated Monthly Budget Exceeded", 
    "length": 0, 
    "no_copy": 0, 
@@ -161,6 +239,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -171,6 +250,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:in_list([\"Stop\", \"Warn\"], doc.action_if_accumulated_monthly_budget_exceeded)", 
    "fieldname": "monthly_distribution", 
    "fieldtype": "Link", 
@@ -179,6 +259,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Monthly Distribution", 
    "length": 0, 
    "no_copy": 0, 
@@ -188,6 +269,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -198,6 +280,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -205,6 +288,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -213,6 +297,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -223,6 +308,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_6", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -230,6 +316,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -237,6 +324,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -247,6 +335,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "accounts", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -254,6 +343,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Budget Accounts", 
    "length": 0, 
    "no_copy": 0, 
@@ -263,6 +353,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -280,7 +371,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-08-18 14:46:02.653081", 
+ "modified": "2016-12-15 14:45:31.079107", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Budget", 
@@ -297,6 +388,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 

erpnext/accounts/doctype/budget/budget.py

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

erpnext/accounts/doctype/budget/test_budget.py

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

erpnext/accounts/doctype/budget_account/budget_account.json

@@ -9,11 +9,13 @@
  "doctype": "DocType", 
  "document_type": "", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "account", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -30,6 +32,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -40,6 +43,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "budget_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -50,11 +54,13 @@
    "label": "Budget Amount", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -72,7 +78,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-11 03:27:58.705376", 
+ "modified": "2017-01-02 17:02:53.339420", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Budget Account", 

erpnext/accounts/doctype/c_form/c_form.json

@@ -3,15 +3,18 @@
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
+ "beta": 0, 
  "creation": "2013-03-07 11:55:06", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -19,6 +22,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -26,6 +30,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -37,6 +42,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "naming_series", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -44,6 +50,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 0, 
@@ -52,6 +59,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -62,6 +70,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "c_form_no", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -69,6 +78,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "C-Form No", 
    "length": 0, 
    "no_copy": 0, 
@@ -76,6 +86,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -86,6 +97,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "received_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -93,6 +105,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Received Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -100,6 +113,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -110,6 +124,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "customer", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -117,6 +132,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Customer", 
    "length": 0, 
    "no_copy": 0, 
@@ -125,6 +141,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -135,6 +152,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -142,6 +160,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -149,6 +168,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -160,6 +180,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -167,6 +188,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -175,6 +197,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 1, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -185,6 +208,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "quarter", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -192,6 +216,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Quarter", 
    "length": 0, 
    "no_copy": 0, 
@@ -200,6 +225,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -210,6 +236,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -217,6 +244,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -225,6 +253,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -235,6 +264,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "state", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -242,6 +272,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "State", 
    "length": 0, 
    "no_copy": 0, 
@@ -249,6 +280,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -259,6 +291,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break0", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -266,12 +299,14 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -282,6 +317,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "invoices", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -289,6 +325,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Invoices", 
    "length": 0, 
    "no_copy": 0, 
@@ -297,6 +334,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -307,6 +345,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_invoiced_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -314,6 +353,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Invoiced Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -322,6 +362,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -332,6 +373,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -339,6 +381,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -347,6 +390,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -356,15 +400,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-file-text", 
+ "icon": "fa fa-file-text", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 3, 
- "modified": "2016-03-03 04:31:05.340444", 
+ "modified": "2016-11-07 05:51:03.273512", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "C-Form", 
@@ -380,6 +425,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -400,6 +446,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -420,6 +467,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -431,8 +479,10 @@
    "write": 0
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_order": "DESC", 
- "timeline_field": "customer"
+ "timeline_field": "customer", 
+ "track_seen": 0
 }

erpnext/accounts/doctype/cheque_print_template/cheque_print_template.py

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

erpnext/accounts/doctype/cost_center/cost_center.js

@@ -50,11 +50,11 @@ cur_frm.cscript.parent_cost_center = function(doc, cdt, cdn) {
 cur_frm.cscript.hide_unhide_group_ledger = function(doc) {
 	if (doc.is_group == 1) {
 		cur_frm.add_custom_button(__('Convert to Non-Group'),
-			function() { cur_frm.cscript.convert_to_ledger(); }, "icon-retweet",
+			function() { cur_frm.cscript.convert_to_ledger(); }, "fa fa-retweet",
 				"btn-default")
 	} else if (doc.is_group == 0) {
 		cur_frm.add_custom_button(__('Convert to Group'),
-			function() { cur_frm.cscript.convert_to_group(); }, "icon-retweet",
+			function() { cur_frm.cscript.convert_to_group(); }, "fa fa-retweet",
 				"btn-default")
 	}
 }

erpnext/accounts/doctype/cost_center/cost_center.json

@@ -10,11 +10,13 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "sb0", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -22,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -29,6 +32,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -39,6 +43,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "cost_center_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -46,6 +51,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Cost Center Name", 
    "length": 0, 
    "no_copy": 1, 
@@ -55,6 +61,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -65,6 +72,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "parent_cost_center", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -72,6 +80,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Parent Cost Center", 
    "length": 0, 
    "no_copy": 0, 
@@ -82,6 +91,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -92,6 +102,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -99,6 +110,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -109,6 +121,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 1, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -119,6 +132,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "cb0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -126,12 +140,14 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -143,6 +159,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "0", 
    "fieldname": "is_group", 
    "fieldtype": "Check", 
@@ -151,6 +168,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -159,6 +177,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -169,6 +188,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "lft", 
    "fieldtype": "Int", 
    "hidden": 1, 
@@ -176,6 +196,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "lft", 
    "length": 0, 
    "no_copy": 1, 
@@ -185,6 +206,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 1, 
@@ -195,6 +217,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "rgt", 
    "fieldtype": "Int", 
    "hidden": 1, 
@@ -202,6 +225,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "rgt", 
    "length": 0, 
    "no_copy": 1, 
@@ -211,6 +235,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 1, 
@@ -221,6 +246,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "old_parent", 
    "fieldtype": "Link", 
    "hidden": 1, 
@@ -228,6 +254,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "old_parent", 
    "length": 0, 
    "no_copy": 1, 
@@ -238,6 +265,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -247,8 +275,9 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-money", 
+ "icon": "fa fa-money", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
@@ -256,7 +285,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-05-16 15:23:14.770933", 
+ "modified": "2017-01-30 11:27:36.615323", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Cost Center", 
@@ -272,6 +301,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -292,6 +322,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -312,6 +343,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -332,6 +364,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -352,6 +385,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -368,6 +402,5 @@
  "read_only_onload": 0, 
  "search_fields": "parent_cost_center, is_group", 
  "sort_order": "ASC", 
- "track_seen": 0, 
- "version": 0
+ "track_seen": 0
 }

erpnext/accounts/doctype/cost_center/cost_center_tree.js

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

erpnext/accounts/doctype/depreciation_schedule/depreciation_schedule.json

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

erpnext/accounts/doctype/fiscal_year/fiscal_year.js

@@ -15,7 +15,7 @@ $.extend(cur_frm.cscript, {
 
 		if (!doc.__islocal && (doc.name != sys_defaults.fiscal_year)) {
 			this.frm.add_custom_button(__("Default"),
-				this.frm.cscript.set_as_default, "icon-star");
+				this.frm.cscript.set_as_default, "fa fa-star");
 			this.frm.set_intro(__("To set this Fiscal Year as Default, click on 'Set as Default'"));
 		} else {
 			this.frm.set_intro("");

erpnext/accounts/doctype/fiscal_year/fiscal_year.json

@@ -131,7 +131,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-calendar", 
+ "icon": "fa fa-calendar", 
  "idx": 1, 
  "in_create": 0, 
  "in_dialog": 0, 

erpnext/accounts/doctype/gl_entry/gl_entry.json

@@ -8,11 +8,14 @@
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "posting_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -20,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Posting Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -29,6 +33,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -39,6 +44,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "transaction_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -46,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Transaction Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -55,6 +62,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -65,6 +73,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "account", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -72,6 +81,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -82,6 +92,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -92,6 +103,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "party_type", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -99,6 +111,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Party Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -107,6 +120,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -117,6 +131,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "party", 
    "fieldtype": "Dynamic Link", 
    "hidden": 0, 
@@ -124,6 +139,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Party", 
    "length": 0, 
    "no_copy": 0, 
@@ -132,6 +148,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -142,6 +159,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "cost_center", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -149,6 +167,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Cost Center", 
    "length": 0, 
    "no_copy": 0, 
@@ -159,6 +178,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -169,6 +189,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "debit", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -176,6 +197,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Debit Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -187,6 +209,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -197,6 +220,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "credit", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -204,6 +228,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Credit Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -215,6 +240,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -225,6 +251,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "account_currency", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -232,6 +259,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Account Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -241,6 +269,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -251,6 +280,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "debit_in_account_currency", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -258,6 +288,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Debit Amount in Account Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -267,6 +298,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -277,6 +309,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "credit_in_account_currency", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -284,6 +317,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Credit Amount in Account Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -293,6 +327,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -303,6 +338,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "against", 
    "fieldtype": "Text", 
    "hidden": 0, 
@@ -310,6 +346,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Against", 
    "length": 0, 
    "no_copy": 0, 
@@ -319,6 +356,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -329,6 +367,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "against_voucher_type", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -336,6 +375,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Against Voucher Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -346,6 +386,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -356,6 +397,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "against_voucher", 
    "fieldtype": "Dynamic Link", 
    "hidden": 0, 
@@ -363,6 +405,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Against Voucher", 
    "length": 0, 
    "no_copy": 0, 
@@ -373,6 +416,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -383,6 +427,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "voucher_type", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -390,6 +435,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Voucher Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -400,6 +446,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -410,6 +457,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "voucher_no", 
    "fieldtype": "Dynamic Link", 
    "hidden": 0, 
@@ -417,6 +465,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Voucher No", 
    "length": 0, 
    "no_copy": 0, 
@@ -427,6 +476,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -437,6 +487,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "project", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -444,6 +495,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Project", 
    "length": 0, 
    "no_copy": 0, 
@@ -453,6 +505,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -463,6 +516,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "remarks", 
    "fieldtype": "Text", 
    "hidden": 0, 
@@ -470,6 +524,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Remarks", 
    "length": 0, 
    "no_copy": 1, 
@@ -479,6 +534,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -489,6 +545,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "is_opening", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -496,6 +553,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Opening", 
    "length": 0, 
    "no_copy": 0, 
@@ -506,6 +564,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -516,6 +575,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "is_advance", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -523,6 +583,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Advance", 
    "length": 0, 
    "no_copy": 0, 
@@ -533,6 +594,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -543,6 +605,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "fiscal_year", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -550,6 +613,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Fiscal Year", 
    "length": 0, 
    "no_copy": 0, 
@@ -560,6 +624,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -570,6 +635,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -577,6 +643,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -587,6 +654,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -596,15 +664,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-list", 
+ "icon": "fa fa-list", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 1, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-05-26 16:22:03.094536", 
+ "modified": "2016-12-15 14:44:41.098790", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "GL Entry", 
@@ -620,6 +689,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -640,6 +710,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -660,6 +731,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 

erpnext/accounts/doctype/gl_entry/gl_entry.py

@@ -44,18 +44,24 @@ class GLEntry(Document):
 				frappe.throw(_("{0} is required").format(_(self.meta.get_label(k))))
 
 		account_type = frappe.db.get_value("Account", self.account, "account_type")
-		if account_type in ["Receivable", "Payable"] and not (self.party_type and self.party):
-			frappe.throw(_("Party Type and Party is required for Receivable / Payable account {0}").format(self.account))
-
+		if not (self.party_type and self.party):
+			if account_type == "Receivable":
+				frappe.throw(_("{0} {1}: Customer is required against Receivable account {2}")
+					.format(self.voucher_type, self.voucher_no, self.account))
+			elif account_type == "Payable":
+				frappe.throw(_("{0} {1}: Supplier is required against Payable account {2}")
+					.format(self.voucher_type, self.voucher_no, self.account))
+				
 		# Zero value transaction is not allowed
 		if not (flt(self.debit) or flt(self.credit)):
-			frappe.throw(_("Either debit or credit amount is required for {0}").format(self.account))
+			frappe.throw(_("{0} {1}: Either debit or credit amount is required for {2}")
+				.format(self.voucher_type, self.voucher_no, self.account))
 
 	def pl_must_have_cost_center(self):
 		if frappe.db.get_value("Account", self.account, "report_type") == "Profit and Loss":
 			if not self.cost_center and self.voucher_type != 'Period Closing Voucher':
-				frappe.throw(_("Cost Center is required for 'Profit and Loss' account {0}")
-					.format(self.account))
+				frappe.throw(_("{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.")
+					.format(self.voucher_type, self.voucher_no, self.account))
 		else:
 			if self.cost_center:
 				self.cost_center = None
@@ -65,7 +71,8 @@ class GLEntry(Document):
 	def check_pl_account(self):
 		if self.is_opening=='Yes' and \
 				frappe.db.get_value("Account", self.account, "report_type")=="Profit and Loss":
-			frappe.throw(_("'Profit and Loss' type account {0} not allowed in Opening Entry").format(self.account))
+			frappe.throw(_("{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry")
+				.format(self.voucher_type, self.voucher_no, self.account))
 
 	def validate_account_details(self, adv_adj):
 		"""Account must be ledger, active and not freezed"""
@@ -74,13 +81,16 @@ class GLEntry(Document):
 			from tabAccount where name=%s""", self.account, as_dict=1)[0]
 
 		if ret.is_group==1:
-			frappe.throw(_("Account {0} cannot be a Group").format(self.account))
+			frappe.throw(_("{0} {1}: Account {2} cannot be a Group")
+				.format(self.voucher_type, self.voucher_no, self.account))
 
 		if ret.docstatus==2:
-			frappe.throw(_("Account {0} is inactive").format(self.account))
+			frappe.throw(_("{0} {1}: Account {2} is inactive")
+				.format(self.voucher_type, self.voucher_no, self.account))
 
 		if ret.company != self.company:
-			frappe.throw(_("Account {0} does not belong to Company {1}").format(self.account, self.company))
+			frappe.throw(_("{0} {1}: Account {2} does not belong to Company {3}")
+				.format(self.voucher_type, self.voucher_no, self.account, self.company))
 
 	def validate_cost_center(self):
 		if not hasattr(self, "cost_center_company"):
@@ -94,7 +104,8 @@ class GLEntry(Document):
 			return self.cost_center_company[self.cost_center]
 
 		if self.cost_center and _get_cost_center_company() != self.company:
-			frappe.throw(_("Cost Center {0} does not belong to Company {1}").format(self.cost_center, self.company))
+			frappe.throw(_("{0} {1}: Cost Center {2} does not belong to Company {3}")
+				.format(self.voucher_type, self.voucher_no, self.cost_center, self.company))
 
 	def validate_party(self):
 		validate_party_frozen_disabled(self.party_type, self.party)
@@ -107,8 +118,9 @@ class GLEntry(Document):
 			self.account_currency = company_currency
 
 		if account_currency != self.account_currency:
-			frappe.throw(_("Accounting Entry for {0} can only be made in currency: {1}")
-				.format(self.account, (account_currency or company_currency)), InvalidAccountCurrency)
+			frappe.throw(_("{0} {1}: Accounting Entry for {2} can only be made in currency: {3}")
+				.format(self.voucher_type, self.voucher_no, self.account, 
+				(account_currency or company_currency)), InvalidAccountCurrency)
 
 		if self.party_type and self.party:
 			validate_party_gle_currency(self.party_type, self.party, self.company, self.account_currency)
@@ -183,6 +195,7 @@ def update_outstanding_amt(account, party_type, party, against_voucher_type, aga
 	if against_voucher_type in ["Sales Invoice", "Purchase Invoice"]:
 		ref_doc = frappe.get_doc(against_voucher_type, against_voucher)
 		ref_doc.db_set('outstanding_amount', bal)
+		ref_doc.set_status(update=True)
 
 def validate_frozen_account(account, adv_adj=None):
 	frozen_account = frappe.db.get_value("Account", account, "freeze_account")

erpnext/accounts/doctype/journal_entry/journal_entry.js

@@ -6,15 +6,6 @@ frappe.provide("erpnext.journal_entry");
 
 
 frappe.ui.form.on("Journal Entry", {
-	setup: function(frm) {
-		frm.get_field('accounts').grid.editable_fields = [
-			{fieldname: 'account', columns: 3},
-			{fieldname: 'party', columns: 3},
-			{fieldname: 'debit_in_account_currency', columns: 2},
-			{fieldname: 'credit_in_account_currency', columns: 2}
-		];
-	},
-
 	refresh: function(frm) {
 		erpnext.toggle_naming_series();
 		frm.cscript.voucher_type(frm.doc);
@@ -29,7 +20,7 @@ frappe.ui.form.on("Journal Entry", {
 					group_by_voucher: 0
 				};
 				frappe.set_route("query-report", "General Ledger");
-			}, "icon-table");
+			}, "fa fa-table");
 		}
 
 		if (frm.doc.__islocal) {
@@ -44,6 +35,14 @@ frappe.ui.form.on("Journal Entry", {
 
 	multi_currency: function(frm) {
 		erpnext.journal_entry.toggle_fields_based_on_currency(frm);
+	},
+	
+	posting_date: function(frm) {
+		if(!frm.doc.multi_currency) return;
+		
+		$.each(frm.doc.accounts || [], function(i, row) {
+			erpnext.journal_entry.set_exchange_rate(frm, row.doctype, row.name);
+		})
 	}
 })
 
@@ -268,7 +267,6 @@ cur_frm.cscript.voucher_type = function(doc, cdt, cdn) {
 	if(!doc.company) return;
 
 	var update_jv_details = function(doc, r) {
-		var jvdetail = frappe.model.add_child(doc, "Journal Entry Account", "accounts");
 		$.each(r, function(i, d) {
 			var row = frappe.model.add_child(doc, "Journal Entry Account", "accounts");
 			row.account = d.account;
@@ -276,8 +274,8 @@ cur_frm.cscript.voucher_type = function(doc, cdt, cdn) {
 		});
 		refresh_field("accounts");
 	}
-
-	if(!(doc.accounts || []).length) {
+	
+	if((!(doc.accounts || []).length) || ((doc.accounts || []).length==1 && !doc.accounts[0].account)) {
 		if(in_list(["Bank Entry", "Cash Entry"], doc.voucher_type)) {
 			return frappe.call({
 				type: "GET",
@@ -355,7 +353,7 @@ frappe.ui.form.on("Journal Entry Account", {
 			});
 		}
 	},
-
+	
 	debit_in_account_currency: function(frm, cdt, cdn) {
 		erpnext.journal_entry.set_exchange_rate(frm, cdt, cdn);
 	},
@@ -430,6 +428,7 @@ $.extend(erpnext.journal_entry, {
 			frappe.call({
 				method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_exchange_rate",
 				args: {
+					posting_date: frm.doc.posting_date,
 					account: row.account,
 					account_currency: row.account_currency,
 					company: frm.doc.company,

erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -37,8 +37,16 @@ class JournalEntry(AccountsController):
 		self.validate_credit_debit_note()
 		self.validate_empty_accounts_table()
 		self.set_account_and_party_balance()
+		self.clear_zero_debit_credit_row()
 		if not self.title:
 			self.title = self.get_title()
+			
+	def clear_zero_debit_credit_row(self):
+		self.accounts = [account for account in self.accounts 
+			if not (account.debit_in_account_currency==0.0 and account.credit_in_account_currency==0.0)]
+
+		if not self.accounts:
+			frappe.throw("Debit or Credit amount is not found in account table")
 
 	def on_submit(self):
 		self.check_credit_limit()
@@ -62,11 +70,22 @@ class JournalEntry(AccountsController):
 
 	def on_cancel(self):
 		from erpnext.accounts.utils import unlink_ref_doc_from_payment_entries
-		unlink_ref_doc_from_payment_entries(self.doctype, self.name)
-
+		from erpnext.hr.doctype.salary_slip.salary_slip import unlink_ref_doc_from_salary_slip
+		unlink_ref_doc_from_payment_entries(self)
+		unlink_ref_doc_from_salary_slip(self.name)
 		self.make_gl_entries(1)
 		self.update_advance_paid()
 		self.update_expense_claim()
+		self.unlink_advance_entry_reference()
+
+	def unlink_advance_entry_reference(self):
+		for d in self.get("accounts"):
+			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 validate_party(self):
 		for d in self.get("accounts"):
@@ -310,9 +329,12 @@ class JournalEntry(AccountsController):
 			if d.account_currency == self.company_currency:
 				d.exchange_rate = 1
 			elif not d.exchange_rate or d.exchange_rate == 1 or \
-				(d.reference_type in ("Sales Invoice", "Purchase Invoice") and d.reference_name):
-					d.exchange_rate = get_exchange_rate(d.account, d.account_currency, self.company,
-						d.reference_type, d.reference_name, d.debit, d.credit, d.exchange_rate)
+				(d.reference_type in ("Sales Invoice", "Purchase Invoice") 
+				and d.reference_name and self.posting_date):
+				
+					# Modified to include the posting date for which to retreive the exchange rate
+					d.exchange_rate = get_exchange_rate(self.posting_date, d.account, d.account_currency, 
+						self.company, d.reference_type, d.reference_name, d.debit, d.credit, d.exchange_rate)
 
 			if not d.exchange_rate:
 				frappe.throw(_("Row {0}: Exchange Rate is mandatory").format(d.idx))
@@ -381,6 +403,7 @@ class JournalEntry(AccountsController):
 
 	def set_total_amount(self, amt, currency):
 		self.total_amount = amt
+		self.total_amount_currency = currency
 		from frappe.utils import money_in_words
 		self.total_amount_in_words = money_in_words(amt, currency)
 
@@ -631,7 +654,10 @@ def get_payment_entry(ref_doc, args):
 	cost_center = frappe.db.get_value("Company", ref_doc.company, "cost_center")
 	exchange_rate = 1
 	if args.get("party_account"):
-		exchange_rate = get_exchange_rate(args.get("party_account"), args.get("party_account_currency"),
+		# Modified to include the posting date for which the exchange rate is required. 
+		# Assumed to be the posting date in the reference document
+		exchange_rate = get_exchange_rate(ref_doc.get("posting_date") or ref_doc.get("transaction_date"), 
+			args.get("party_account"), args.get("party_account_currency"),
 			ref_doc.company, ref_doc.doctype, ref_doc.name)
 
 	je = frappe.new_doc("Journal Entry")
@@ -664,7 +690,10 @@ def get_payment_entry(ref_doc, args):
 	bank_account = get_default_bank_cash_account(ref_doc.company, "Bank", account=args.get("bank_account"))
 	if bank_account:
 		bank_row.update(bank_account)
-		bank_row.exchange_rate = get_exchange_rate(bank_account["account"],
+		# Modified to include the posting date for which the exchange rate is required. 
+		# Assumed to be the posting date of the reference date
+		bank_row.exchange_rate = get_exchange_rate(ref_doc.get("posting_date") 
+			or ref_doc.get("transaction_date"), bank_account["account"], 
 			bank_account["account_currency"], ref_doc.company)
 
 	bank_row.cost_center = cost_center
@@ -760,7 +789,8 @@ def get_party_account_and_balance(company, party_type, party):
 	return {
 		"account": account,
 		"balance": account_balance,
-		"party_balance": party_balance
+		"party_balance": party_balance,
+		"account_currency": frappe.db.get_value("Account", account, "account_currency")
 	}
 
 @frappe.whitelist()
@@ -787,7 +817,10 @@ def get_account_balance_and_party_type(account, date, company, debit=None, credi
 		"party_type": party_type,
 		"account_type": account_details.account_type,
 		"account_currency": account_details.account_currency or company_currency,
-		"exchange_rate": get_exchange_rate(account, account_details.account_currency,
+		
+		# The date used to retreive the exchange rate here is the date passed in 
+		# as an argument to this function. It is assumed to be the date on which the balance is sought
+		"exchange_rate": get_exchange_rate(date, account, account_details.account_currency,
 			company, debit=debit, credit=credit, exchange_rate=exchange_rate)
 	}
 
@@ -797,8 +830,9 @@ def get_account_balance_and_party_type(account, date, company, debit=None, credi
 
 	return grid_values
 
+# Added posting_date as one of the parameters of get_exchange_rate
 @frappe.whitelist()
-def get_exchange_rate(account, account_currency=None, company=None,
+def get_exchange_rate(posting_date, account, account_currency=None, company=None,
 		reference_type=None, reference_name=None, debit=None, credit=None, exchange_rate=None):
 	from erpnext.setup.utils import get_exchange_rate
 	account_details = frappe.db.get_value("Account", account,
@@ -824,9 +858,10 @@ def get_exchange_rate(account, account_currency=None, company=None,
 				(account_details.root_type == "Liability" and debit)):
 			exchange_rate = get_average_exchange_rate(account)
 
-		if not exchange_rate and account_currency:
-			exchange_rate = get_exchange_rate(account_currency, company_currency)
-
+		# The date used to retreive the exchange rate here is the date passed 
+		# in as an argument to this function.
+		if not exchange_rate and account_currency and posting_date:
+			exchange_rate = get_exchange_rate(account_currency, company_currency, posting_date)
 	else:
 		exchange_rate = 1
 

erpnext/accounts/doctype/journal_entry/test_journal_entry.py

@@ -171,8 +171,25 @@ class TestJournalEntry(unittest.TestCase):
 		})
 
 		jv.submit()
+		
+	def test_clear_blank_rows(self):
+		je = make_journal_entry("_Test Bank - _TC", "_Test Account Stock Expenses - _TC", 100, save=False)
+		je.append("accounts", {
+			"account": "_Test Cash - _TC",
+			"debit_in_account_currency": 0,
+			"credit_in_account_currency": 0,
+			"exchange_rate": 1
+		})
+		
+		self.assertEqual(len(je.get("accounts")), 3)
+		je.save()
+		self.assertEqual(len(je.get("accounts")), 2)		
+		
+
+def make_journal_entry(account1, account2, amount, cost_center=None, posting_date=None, exchange_rate=1, save=True, submit=False, project=None):
+	if not cost_center:
+		cost_center = "_Test Cost Center - _TC"
 
-def make_journal_entry(account1, account2, amount, cost_center=None, posting_date=None, exchange_rate=1, save=True, submit=False):
 	jv = frappe.new_doc("Journal Entry")
 	jv.posting_date = posting_date or "2013-02-14"
 	jv.company = "_Test Company"
@@ -182,12 +199,14 @@ def make_journal_entry(account1, account2, amount, cost_center=None, posting_dat
 		{
 			"account": account1,
 			"cost_center": cost_center,
+			"project": project,
 			"debit_in_account_currency": amount if amount > 0 else 0,
 			"credit_in_account_currency": abs(amount) if amount < 0 else 0,
 			"exchange_rate": exchange_rate
 		}, {
 			"account": account2,
 			"cost_center": cost_center,
+			"project": project,
 			"credit_in_account_currency": amount if amount > 0 else 0,
 			"debit_in_account_currency": abs(amount) if amount < 0 else 0,
 			"exchange_rate": exchange_rate

erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json

@@ -14,6 +14,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 3, 
    "fieldname": "account", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -43,6 +44,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "account_type", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -68,6 +70,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "balance", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -95,6 +98,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": ":Company", 
    "description": "If Income or Expense", 
    "fieldname": "cost_center", 
@@ -126,6 +130,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -149,6 +154,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "party_type", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -174,6 +180,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 3, 
    "fieldname": "party", 
    "fieldtype": "Dynamic Link", 
    "hidden": 0, 
@@ -199,6 +206,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "party_balance", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -226,6 +234,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "collapsible_depends_on": "", 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "currency_section", 
    "fieldtype": "Section Break", 
@@ -252,6 +261,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "account_currency", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -278,6 +288,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_10", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -302,6 +313,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "exchange_rate", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -327,6 +339,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "sec_break1", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -351,6 +364,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "debit_in_account_currency", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -377,6 +391,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "debit", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -405,6 +420,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break2", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -428,6 +444,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "credit_in_account_currency", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -454,6 +471,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "credit", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -482,6 +500,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reference", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -506,6 +525,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reference_type", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -532,6 +552,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reference_name", 
    "fieldtype": "Dynamic Link", 
    "hidden": 0, 
@@ -558,6 +579,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "project", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -584,6 +606,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -607,6 +630,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "is_advance", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -634,6 +658,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "against_account", 
    "fieldtype": "Text", 
    "hidden": 1, 
@@ -667,7 +692,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-11 03:28:01.575159", 
+ "modified": "2016-08-26 01:54:32.267927", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Journal Entry Account", 

erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json

@@ -3,16 +3,20 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:mode_of_payment", 
+ "beta": 0, 
  "creation": "2012-12-04 17:49:20", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "mode_of_payment", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -20,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Mode of Payment", 
    "length": 0, 
    "no_copy": 0, 
@@ -29,6 +34,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -39,6 +45,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "type", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -46,6 +53,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -55,6 +63,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -65,6 +74,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "accounts", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -72,6 +82,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Accounts", 
    "length": 0, 
    "no_copy": 0, 
@@ -81,6 +92,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -90,15 +102,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-credit-card", 
+ "icon": "fa fa-credit-card", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-04-26 11:48:17.411796", 
+ "modified": "2016-11-07 05:54:39.560399", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Mode of Payment", 
@@ -114,6 +127,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -134,6 +148,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 

erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json

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

erpnext/accounts/doctype/payment_entry/payment_entry.js

@@ -11,13 +11,6 @@ frappe.ui.form.on('Payment Entry', {
 	},
 
 	setup: function(frm) {
-		frm.get_field('references').grid.editable_fields = [
-			{fieldname: 'reference_doctype', columns: 2},
-			{fieldname: 'reference_name', columns: 2},
-			{fieldname: 'outstanding_amount', columns: 3},
-			{fieldname: 'allocated_amount', columns: 3}
-		];
-
 		var party_account_type = frm.doc.party_type=="Customer" ? "Receivable" : "Payable";
 
 		frm.set_query("paid_from", function() {
@@ -86,8 +79,13 @@ frappe.ui.form.on('Payment Entry', {
 		frm.events.show_general_ledger(frm);
 	},
 
+	company: function(frm) {
+		frm.events.hide_unhide_fields(frm);
+		frm.events.set_dynamic_labels(frm);
+	},
+
 	hide_unhide_fields: function(frm) {
-		var company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
+		var company_currency = frm.doc.company? frappe.get_doc(":Company", frm.doc.company).default_currency: "";
 
 		frm.toggle_display("source_exchange_rate",
 			(frm.doc.paid_amount && frm.doc.paid_from_account_currency != company_currency));
@@ -125,52 +123,27 @@ frappe.ui.form.on('Payment Entry', {
 	},
 
 	set_dynamic_labels: function(frm) {
-		var company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
+		var company_currency = frm.doc.company? frappe.get_doc(":Company", frm.doc.company).default_currency: "";
 
-		var field_label_map = {};
-		var grid_field_label_map = {};
-
-		var setup_field_label_map = function(fields_list, currency, parentfield) {
-			var doctype = parentfield ? frm.fields_dict[parentfield].grid.doctype : frm.doc.doctype;
-			$.each(fields_list, function(i, fname) {
-				var docfield = frappe.meta.docfield_map[doctype][fname];
-				if(docfield) {
-					var label = __(docfield.label || "").replace(/\([^\)]*\)/g, "");
-					if(parentfield) {
-						grid_field_label_map[doctype + "-" + fname] =
-							label.trim() + " (" + __(currency) + ")";
-					} else {
-						field_label_map[fname] = label.trim() + " (" + currency + ")";
-					}
-				}
-			});
-		}
-
-		setup_field_label_map(["base_paid_amount", "base_received_amount", "base_total_allocated_amount",
+		frm.set_currency_labels(["base_paid_amount", "base_received_amount", "base_total_allocated_amount",
 			"difference_amount"], company_currency);
 
-		setup_field_label_map(["paid_amount"], frm.doc.paid_from_account_currency);
-		setup_field_label_map(["received_amount"], frm.doc.paid_to_account_currency);
+		frm.set_currency_labels(["paid_amount"], frm.doc.paid_from_account_currency);
+		frm.set_currency_labels(["received_amount"], frm.doc.paid_to_account_currency);
 
 		var party_account_currency = frm.doc.payment_type=="Receive" ?
 			frm.doc.paid_from_account_currency : frm.doc.paid_to_account_currency;
 
-		setup_field_label_map(["total_allocated_amount", "unallocated_amount"], party_account_currency);
+		frm.set_currency_labels(["total_allocated_amount", "unallocated_amount"], party_account_currency);
 
-		$.each(field_label_map, function(fname, label) {
-			me.frm.fields_dict[fname].set_label(label);
-		});
+		var currency_field = (frm.doc.payment_type=="Receive") ? "paid_from_account_currency" : "paid_to_account_currency"
+		frm.set_df_property("total_allocated_amount", "options", currency_field);
+		frm.set_df_property("unallocated_amount", "options", currency_field);
 
-		setup_field_label_map(["total_amount", "outstanding_amount", "allocated_amount"],
+		frm.set_currency_labels(["total_amount", "outstanding_amount", "allocated_amount"],
 			party_account_currency, "references");
 
-		setup_field_label_map(["amount"], company_currency, "deductions");
-
-		$.each(grid_field_label_map, function(fname, label) {
-			fname = fname.split("-");
-			var df = frappe.meta.get_docfield(fname[0], fname[1], me.frm.doc.name);
-			if(df) df.label = label;
-		});
+		frm.set_currency_labels(["amount"], company_currency, "deductions");
 
 		cur_frm.set_df_property("source_exchange_rate", "description",
 			("1 " + frm.doc.paid_from_account_currency + " = [?] " + company_currency));
@@ -192,7 +165,7 @@ frappe.ui.form.on('Payment Entry', {
 					group_by_voucher: 0
 				};
 				frappe.set_route("query-report", "General Ledger");
-			}, "icon-table");
+			}, "fa fa-table");
 		}
 	},
 
@@ -363,6 +336,7 @@ frappe.ui.form.on('Payment Entry', {
 		frappe.call({
 			method: "erpnext.setup.utils.get_exchange_rate",
 			args: {
+				transaction_date: frm.doc.posting_date,
 				from_currency: from_currency,
 				to_currency: to_currency
 			},
@@ -371,6 +345,10 @@ frappe.ui.form.on('Payment Entry', {
 			}
 		})
 	},
+	
+	posting_date: function(frm) {
+		frm.events.paid_from_account_currency(frm);
+	},
 
 	source_exchange_rate: function(frm) {
 		if (frm.doc.paid_amount) {
@@ -413,7 +391,10 @@ frappe.ui.form.on('Payment Entry', {
 
 		if(!frm.doc.paid_amount && frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency) {
 			frm.set_value("paid_amount", frm.doc.received_amount);
-			frm.set_value("source_exchange_rate", frm.doc.target_exchange_rate);
+
+			if(frm.doc.target_exchange_rate) {
+				frm.set_value("source_exchange_rate", frm.doc.target_exchange_rate);
+			}
 			frm.set_value("base_paid_amount", frm.doc.base_received_amount);
 		}
 
@@ -433,7 +414,10 @@ frappe.ui.form.on('Payment Entry', {
 				(frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency)) {
 			
 			frm.set_value("received_amount", frm.doc.paid_amount);
-			frm.set_value("target_exchange_rate", frm.doc.source_exchange_rate);
+
+			if(frm.doc.source_exchange_rate) {
+				frm.set_value("target_exchange_rate", frm.doc.source_exchange_rate);
+			}
 			frm.set_value("base_received_amount", frm.doc.base_paid_amount);
 		}
 		
@@ -455,6 +439,7 @@ frappe.ui.form.on('Payment Entry', {
 			method: 'erpnext.accounts.doctype.payment_entry.payment_entry.get_outstanding_reference_documents',
 			args: {
 				args: {
+					"posting_date": frm.doc.posting_date,
 					"company": frm.doc.company,
 					"party_type": frm.doc.party_type,
 					"payment_type": frm.doc.payment_type,
@@ -511,6 +496,18 @@ frappe.ui.form.on('Payment Entry', {
 		});
 	},
 
+	allocate_payment_amount: function(frm) {
+		if(frm.doc.payment_type == 'Internal Transfer'){
+			return
+		}
+
+		if(frm.doc.references.length == 0){
+			frm.events.get_outstanding_documents(frm);
+		}
+
+		frm.events.allocate_party_amount_against_ref_docs(frm, frm.doc.received_amount);
+	},
+
 	allocate_party_amount_against_ref_docs: function(frm, paid_amount) {
 		var total_positive_outstanding_including_order = 0;
 		var total_negative_outstanding = 0;
@@ -552,22 +549,24 @@ frappe.ui.form.on('Payment Entry', {
 		}
 
 		$.each(frm.doc.references || [], function(i, row) {
-			row.allocated_amount = 0
+			row.allocated_amount = 0 //If allocate payment amount checkbox is unchecked, set zero to allocate amount
+			if(frm.doc.allocate_payment_amount){
+				if(row.outstanding_amount > 0 && allocated_positive_outstanding > 0) {
+					if(row.outstanding_amount >= allocated_positive_outstanding)
+							row.allocated_amount = allocated_positive_outstanding;
+					else row.allocated_amount = row.outstanding_amount;
 
-			if(row.outstanding_amount > 0 && allocated_positive_outstanding > 0) {
-				if(row.outstanding_amount >= allocated_positive_outstanding)
-						row.allocated_amount = allocated_positive_outstanding;
-				else row.allocated_amount = row.outstanding_amount;
+					allocated_positive_outstanding -= flt(row.allocated_amount);
+				} else if (row.outstanding_amount < 0 && allocated_negative_outstanding) {
+					if(Math.abs(row.outstanding_amount) >= allocated_negative_outstanding)
+						row.allocated_amount = -1*allocated_negative_outstanding;
+					else row.allocated_amount = row.outstanding_amount;
 
-				allocated_positive_outstanding -= flt(row.allocated_amount);
-			} else if (row.outstanding_amount < 0 && allocated_negative_outstanding) {
-				if(Math.abs(row.outstanding_amount) >= allocated_negative_outstanding)
-					row.allocated_amount = -1*allocated_negative_outstanding;
-				else row.allocated_amount = row.outstanding_amount;
-
-				allocated_negative_outstanding -= Math.abs(flt(row.allocated_amount));
+					allocated_negative_outstanding -= Math.abs(flt(row.allocated_amount));
+				}
 			}
 		})
+
 		frm.refresh_fields()
 		frm.events.set_total_allocated_amount(frm);
 	},
@@ -751,4 +750,4 @@ frappe.ui.form.on('Payment Entry Deduction', {
 	deductions_remove: function(frm) {
 		frm.events.set_difference_amount(frm);
 	}
-})
+})

erpnext/accounts/doctype/payment_entry/payment_entry.json

@@ -23,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Type of Payment", 
    "length": 0, 
    "no_copy": 0, 
@@ -31,6 +32,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -49,6 +51,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 0, 
@@ -58,6 +61,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -76,6 +80,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Payment Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -85,6 +90,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -104,6 +110,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Party Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -113,6 +120,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -132,6 +140,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Party", 
    "length": 0, 
    "no_copy": 0, 
@@ -141,6 +150,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -148,17 +158,19 @@
    "unique": 0
   }, 
   {
-   "allow_on_submit": 0, 
+   "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "description": "", 
    "fieldname": "party_name", 
    "fieldtype": "Data", 
-   "hidden": 1, 
+   "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Party Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -166,7 +178,8 @@
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 1, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -185,6 +198,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -192,6 +206,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -211,6 +226,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Posting Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -219,6 +235,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -237,6 +254,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -246,6 +264,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 1, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -264,6 +283,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Mode of Payment", 
    "length": 0, 
    "no_copy": 0, 
@@ -273,6 +293,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -291,6 +312,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Accounts", 
    "length": 0, 
    "no_copy": 0, 
@@ -299,6 +321,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -318,6 +341,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Party Balance", 
    "length": 0, 
    "no_copy": 0, 
@@ -326,6 +350,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -345,6 +370,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Account Paid From", 
    "length": 0, 
    "no_copy": 0, 
@@ -354,6 +380,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -373,6 +400,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Account Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -382,6 +410,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -401,6 +430,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Account Balance", 
    "length": 0, 
    "no_copy": 0, 
@@ -410,6 +440,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -428,6 +459,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -435,6 +467,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -454,6 +487,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Account Paid To", 
    "length": 0, 
    "no_copy": 0, 
@@ -463,6 +497,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -482,6 +517,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Account Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -491,6 +527,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -510,6 +547,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Account Balance", 
    "length": 0, 
    "no_copy": 0, 
@@ -519,6 +557,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -539,6 +578,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -547,6 +587,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -566,6 +607,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Paid Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -575,6 +617,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -594,6 +637,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Exchange Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -602,6 +646,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -621,6 +666,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Paid Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -630,6 +676,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -648,6 +695,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -655,6 +703,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -674,6 +723,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Received Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -683,6 +733,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -702,6 +753,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Exchange Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -710,6 +762,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -729,6 +782,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Received Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -738,6 +792,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -758,6 +813,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reference", 
    "length": 0, 
    "no_copy": 0, 
@@ -766,6 +822,37 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "1", 
+   "depends_on": "eval:in_list(['Pay', 'Receive'], doc.payment_type)", 
+   "fieldname": "allocate_payment_amount", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Allocate Payment 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": 0, 
    "search_index": 0, 
@@ -785,6 +872,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Payment References", 
    "length": 0, 
    "no_copy": 0, 
@@ -794,6 +882,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -813,6 +902,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Writeoff", 
    "length": 0, 
    "no_copy": 0, 
@@ -821,6 +911,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -840,6 +931,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Allocated Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -848,6 +940,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -867,6 +960,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Allocated Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -876,6 +970,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -894,6 +989,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Set Exchange Gain / Loss", 
    "length": 0, 
    "no_copy": 0, 
@@ -902,6 +998,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -920,6 +1017,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -927,6 +1025,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -946,6 +1045,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Unallocated Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -954,6 +1054,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -973,6 +1074,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Difference Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -982,6 +1084,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1001,6 +1104,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Write Off Difference Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -1009,6 +1113,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1029,6 +1134,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Deductions or Loss", 
    "length": 0, 
    "no_copy": 0, 
@@ -1037,6 +1143,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1055,6 +1162,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Payment Deductions or Loss", 
    "length": 0, 
    "no_copy": 0, 
@@ -1064,6 +1172,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1082,6 +1191,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Transaction ID", 
    "length": 0, 
    "no_copy": 0, 
@@ -1090,6 +1200,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1109,6 +1220,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Cheque/Reference No", 
    "length": 0, 
    "no_copy": 0, 
@@ -1117,6 +1229,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1135,6 +1248,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1142,6 +1256,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1161,6 +1276,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Cheque/Reference Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -1169,6 +1285,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1188,6 +1305,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Clearance Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -1196,6 +1314,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1216,6 +1335,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "More Information", 
    "length": 0, 
    "no_copy": 0, 
@@ -1224,6 +1344,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1243,6 +1364,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Project", 
    "length": 0, 
    "no_copy": 0, 
@@ -1252,6 +1374,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1270,6 +1393,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Remarks", 
    "length": 0, 
    "no_copy": 0, 
@@ -1278,6 +1402,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1296,6 +1421,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1303,6 +1429,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1321,6 +1448,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Letter Head", 
    "length": 0, 
    "no_copy": 0, 
@@ -1330,6 +1458,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1348,6 +1477,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Heading", 
    "length": 0, 
    "no_copy": 0, 
@@ -1357,6 +1487,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1375,6 +1506,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -1383,6 +1515,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1401,6 +1534,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Title", 
    "length": 0, 
    "no_copy": 0, 
@@ -1409,6 +1543,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1426,7 +1561,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-09-05 11:06:18.183458", 
+ "modified": "2016-11-07 05:33:40.371480", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Entry", 
@@ -1443,6 +1578,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1463,6 +1599,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 

erpnext/accounts/doctype/payment_entry/payment_entry.py

@@ -60,7 +60,14 @@ class PaymentEntry(AccountsController):
 		self.setup_party_account_field()
 		self.make_gl_entries(cancel=1)
 		self.update_advance_paid()
-							
+		self.delink_advance_entry_references()
+	
+	def delink_advance_entry_references(self):
+		for reference in self.references:
+			if reference.reference_doctype in ("Sales Invoice", "Purchase Invoice"):
+				doc = frappe.get_doc(reference.reference_doctype, reference.reference_name)
+				doc.delink_advance_entries(self.name)
+
 	def set_missing_values(self):
 		if self.payment_type == "Internal Transfer":
 			for field in ("party", "party_balance", "total_allocated_amount", 
@@ -146,11 +153,11 @@ class PaymentEntry(AccountsController):
 				self.source_exchange_rate = get_average_exchange_rate(self.paid_from)
 			else:
 				self.source_exchange_rate = get_exchange_rate(self.paid_from_account_currency, 
-					self.company_currency)
+					self.company_currency, self.posting_date)
 		
 		if self.paid_to and not self.target_exchange_rate:
 			self.target_exchange_rate = get_exchange_rate(self.paid_to_account_currency, 
-				self.company_currency)
+				self.company_currency, self.posting_date)
 				
 	def validate_mandatory(self):
 		for field in ("paid_amount", "received_amount", "source_exchange_rate", "target_exchange_rate"):
@@ -475,12 +482,12 @@ def get_outstanding_reference_documents(args):
 				d["exchange_rate"] = frappe.db.get_value(d.voucher_type, d.voucher_no, "conversion_rate")
 
 	# Get all SO / PO which are not fully billed or aginst which full advance not paid
-	orders_to_be_billed =  get_orders_to_be_billed(args.get("party_type"), args.get("party"), 
+	orders_to_be_billed =  get_orders_to_be_billed(args.get("posting_date"),args.get("party_type"), args.get("party"), 
 		party_account_currency, company_currency)
 	
 	return negative_outstanding_invoices + outstanding_invoices + orders_to_be_billed
 	
-def get_orders_to_be_billed(party_type, party, party_account_currency, company_currency):
+def get_orders_to_be_billed(posting_date, party_type, party, party_account_currency, company_currency):
 	voucher_type = 'Sales Order' if party_type == "Customer" else 'Purchase Order'
 
 	ref_field = "base_grand_total" if party_account_currency == company_currency else "grand_total"
@@ -510,7 +517,9 @@ def get_orders_to_be_billed(party_type, party, party_account_currency, company_c
 	order_list = []
 	for d in orders:
 		d["voucher_type"] = voucher_type
-		d["exchange_rate"] = get_exchange_rate(party_account_currency, company_currency)
+		# This assumes that the exchange rate required is the one in the SO
+		d["exchange_rate"] = get_exchange_rate(party_account_currency, 
+			company_currency, posting_date)
 		order_list.append(d)
 
 	return order_list
@@ -585,14 +594,19 @@ def get_reference_details(reference_doctype, reference_name, party_account_curre
 			exchange_rate = 1
 		else:
 			total_amount = ref_doc.grand_total
+			
+			# Get the exchange rate from the original ref doc 
+			# or get it based on the posting date of the ref doc
 			exchange_rate = ref_doc.get("conversion_rate") or \
-				get_exchange_rate(party_account_currency, ref_doc.company_currency)
+				get_exchange_rate(party_account_currency, ref_doc.company_currency, ref_doc.posting_date)
 		
 		outstanding_amount = ref_doc.get("outstanding_amount") \
 			if reference_doctype in ("Sales Invoice", "Purchase Invoice") \
 			else flt(total_amount) - flt(ref_doc.advance_paid)			
 	else:
-		exchange_rate = get_exchange_rate(party_account_currency, ref_doc.company_currency)
+		# Get the exchange rate based on the posting date of the ref doc
+		exchange_rate = get_exchange_rate(party_account_currency, 
+			ref_doc.company_currency, ref_doc.posting_date)
 		
 	return frappe._dict({
 		"due_date": ref_doc.get("due_date"),
@@ -632,7 +646,7 @@ 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"):
-		grand_total = 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
 	else:
 		total_field = "base_grand_total" if party_account_currency == doc.company_currency else "grand_total"
@@ -669,6 +683,7 @@ def get_payment_entry(dt, dn, party_amount=None, bank_account=None, bank_amount=
 	pe.paid_to_account_currency = party_account_currency if payment_type=="Pay" else bank.account_currency
 	pe.paid_amount = paid_amount
 	pe.received_amount = received_amount
+	pe.allocate_payment_amount = 1
 	
 	pe.append("references", {
 		"reference_doctype": dt,

erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json

@@ -14,13 +14,14 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "reference_doctype", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 0, 
+   "in_list_view": 1, 
    "label": "Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -30,6 +31,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -40,6 +42,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "reference_name", 
    "fieldtype": "Dynamic Link", 
    "hidden": 0, 
@@ -56,6 +59,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -66,6 +70,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "due_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -81,6 +86,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -91,6 +97,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_4", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -105,6 +112,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -115,6 +123,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "total_amount", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -130,6 +139,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -140,6 +150,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "outstanding_amount", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -155,6 +166,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -165,6 +177,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "allocated_amount", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -180,6 +193,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -190,6 +204,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "exchange_rate", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -205,6 +220,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -222,7 +238,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-14 14:48:13.356944", 
+ "modified": "2016-11-14 12:28:51.822341", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Entry Reference", 

erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js

@@ -4,15 +4,6 @@
 frappe.provide("erpnext.accounts");
 
 erpnext.accounts.PaymentReconciliationController = frappe.ui.form.Controller.extend({
-	setup: function() {
-		this.frm.get_field('payments').grid.editable_fields = [
-			{fieldname: 'reference_name', columns: 3},
-			{fieldname: 'invoice_number', columns: 3},
-			{fieldname: 'amount', columns: 2},
-			{fieldname: 'allocated_amount', columns: 2}
-		];
-	},
-
 	onload: function() {
 		var me = this
 		this.frm.set_query('party_type', function() {

erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json

@@ -388,7 +388,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 1, 
- "icon": "icon-resize-horizontal", 
+ "icon": "fa fa-resize-horizontal", 
  "idx": 0, 
  "in_create": 0, 
  "in_dialog": 0, 

erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json

@@ -14,6 +14,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reference_type", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -39,6 +40,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 3, 
    "fieldname": "reference_name", 
    "fieldtype": "Dynamic Link", 
    "hidden": 0, 
@@ -65,13 +67,14 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "posting_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "label": "Posting Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -89,30 +92,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "is_advance", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -137,6 +117,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reference_row", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -161,6 +142,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -185,6 +167,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 3, 
    "fieldname": "invoice_number", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -210,6 +193,32 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "allocated_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -235,6 +244,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "sec_break1", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -259,6 +269,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "remark", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -291,7 +302,7 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-07-11 03:28:03.672936", 
+ "modified": "2016-08-26 02:08:35.879133", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Reconciliation Payment", 

erpnext/accounts/doctype/payment_request/payment_request.json

@@ -2,7 +2,7 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
- "autoname": "PR.######", 
+ "autoname": "naming_series:", 
  "beta": 0, 
  "creation": "2015-12-15 22:23:24.745065", 
  "custom": 0, 
@@ -10,11 +10,42 @@
  "doctype": "DocType", 
  "document_type": "", 
  "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Series", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "PR", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "recipient_and_message", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -22,6 +53,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Recipient Message And Payment Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -30,6 +62,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -40,6 +73,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "", 
    "fieldname": "print_format", 
    "fieldtype": "Select", 
@@ -48,6 +82,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Format", 
    "length": 0, 
    "no_copy": 0, 
@@ -57,6 +92,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -67,6 +103,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "email_to", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -74,6 +111,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "To", 
    "length": 0, 
    "no_copy": 0, 
@@ -82,6 +120,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -92,6 +131,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "subject", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -99,6 +139,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Subject", 
    "length": 0, 
    "no_copy": 0, 
@@ -107,6 +148,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -117,6 +159,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_9", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -124,6 +167,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -131,6 +175,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -141,6 +186,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "payment_gateway_account", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -148,6 +194,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Payment Gateway Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -157,6 +204,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -167,6 +215,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "currency", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -174,6 +223,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Transaction Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -183,6 +233,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -193,6 +244,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Amount in customer's currency", 
    "fieldname": "grand_total", 
    "fieldtype": "Currency", 
@@ -201,6 +253,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -210,6 +263,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -220,6 +274,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Draft", 
    "fieldname": "status", 
    "fieldtype": "Select", 
@@ -228,6 +283,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 0, 
@@ -237,6 +293,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -247,6 +304,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.reference_doctype==\"Sales Order\"", 
    "fieldname": "make_sales_invoice", 
    "fieldtype": "Check", 
@@ -255,6 +313,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Make Sales Invoice", 
    "length": 0, 
    "no_copy": 0, 
@@ -263,6 +322,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -273,6 +333,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_10", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -280,6 +341,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -287,6 +349,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -297,6 +360,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "message", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -304,6 +368,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Message", 
    "length": 0, 
    "no_copy": 0, 
@@ -312,6 +377,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -322,6 +388,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "message_examples", 
    "fieldtype": "HTML", 
    "hidden": 0, 
@@ -329,6 +396,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Message Examples", 
    "length": 0, 
    "no_copy": 0, 
@@ -338,6 +406,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -348,6 +417,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "mute_email", 
    "fieldtype": "Check", 
    "hidden": 1, 
@@ -355,6 +425,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Mute Email", 
    "length": 0, 
    "no_copy": 1, 
@@ -363,6 +434,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -373,13 +445,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "payment_url", 
-   "fieldtype": "Data", 
+   "fieldtype": "Small Text", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "payment_url", 
    "length": 0, 
    "no_copy": 0, 
@@ -388,6 +462,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -399,6 +474,7 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "doc.payment_gateway_account", 
+   "columns": 0, 
    "fieldname": "section_break_7", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -406,6 +482,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Payment Gateway Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -414,6 +491,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -424,6 +502,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "payment_gateway", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -431,6 +510,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Payment Gateway", 
    "length": 0, 
    "no_copy": 0, 
@@ -440,6 +520,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -450,6 +531,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "payment_account", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -457,6 +539,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Payment Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -466,6 +549,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -476,6 +560,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reference_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -483,6 +568,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reference Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -491,6 +577,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -501,6 +588,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reference_doctype", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -508,6 +596,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Reference Doctype", 
    "length": 0, 
    "no_copy": 1, 
@@ -517,6 +606,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -527,6 +617,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reference_name", 
    "fieldtype": "Dynamic Link", 
    "hidden": 0, 
@@ -534,6 +625,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Reference Name", 
    "length": 0, 
    "no_copy": 1, 
@@ -543,6 +635,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -553,6 +646,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -560,6 +654,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -568,6 +663,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -585,7 +681,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-25 01:34:44.372161", 
+ "modified": "2016-12-15 14:46:19.662816", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Request", 
@@ -602,6 +698,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -622,6 +719,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 

erpnext/accounts/doctype/payment_request/payment_request.py

@@ -6,10 +6,11 @@ from __future__ import unicode_literals
 import frappe
 from frappe import _
 from frappe.model.document import Document
-from frappe.utils import flt, get_url, nowdate
+from frappe.utils import flt, nowdate, get_url
 from erpnext.accounts.party import get_party_account
 from erpnext.accounts.utils import get_account_currency
 from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry, get_company_defaults
+from frappe.integration_broker.doctype.integration_service.integration_service import get_integration_controller
 
 class PaymentRequest(Document):
 	def validate(self):
@@ -25,7 +26,7 @@ class PaymentRequest(Document):
 		ref_doc = frappe.get_doc(self.reference_doctype, self.reference_name)
 		if self.payment_account and ref_doc.currency != frappe.db.get_value("Account", self.payment_account, "account_currency"):
 			frappe.throw(_("Transaction currency must be same as Payment Gateway currency"))
-
+		
 	def on_submit(self):
 		send_mail = True
 		self.make_communication_entry()
@@ -35,17 +36,13 @@ class PaymentRequest(Document):
 			send_mail = False
 
 		if send_mail and not self.flags.mute_email:
-			self.send_payment_request()
+			self.set_payment_request_url()
 			self.send_email()
 
 	def on_cancel(self):
+		self.check_if_payment_entry_exists()
 		self.set_as_cancelled()
 
-	def get_payment_url(self):
-		""" This is blanck method to trigger hooks call from individual payment gateway app
-		which will return respective payment gateway"""
-		pass
-
 	def make_invoice(self):
 		ref_doc = frappe.get_doc(self.reference_doctype, self.reference_name)
 		if hasattr(ref_doc, "order_type") and getattr(ref_doc, "order_type") == "Shopping Cart":
@@ -54,20 +51,39 @@ class PaymentRequest(Document):
 			si = si.insert(ignore_permissions=True)
 			si.submit()
 
-	def send_payment_request(self):
+	def set_payment_request_url(self):
 		if self.payment_account:
-			self.payment_url = get_url("/api/method/erpnext.accounts.doctype.payment_request.payment_request.generate_payment_request?name={0}".format(self.name))
+			self.payment_url = self.get_payment_url()
 		
 		if self.payment_url:
 			self.db_set('payment_url', self.payment_url)
 			
 		if self.payment_url or not self.payment_gateway_account:
 			self.db_set('status', 'Initiated')
+	
+	def get_payment_url(self):
+		data = frappe.db.get_value(self.reference_doctype, self.reference_name,
+			["company", "customer_name"], as_dict=1)
+		
+		controller = get_integration_controller(self.payment_gateway)
+		controller.validate_transaction_currency(self.currency)
+		
+		return controller.get_payment_url(**{
+			"amount": self.grand_total,
+			"title": data.company,
+			"description": self.subject,
+			"reference_doctype": "Payment Request",
+			"reference_docname": self.name,
+			"payer_email": self.email_to or frappe.session.user,
+			"payer_name": data.customer_name,
+			"order_id": self.name,
+			"currency": self.currency
+		})
 
 	def set_as_paid(self):
 		if frappe.session.user == "Guest":
 			frappe.set_user("Administrator")
-
+		
 		payment_entry = self.create_payment_entry()
 		self.make_invoice()
 
@@ -141,6 +157,13 @@ class PaymentRequest(Document):
 
 	def set_as_cancelled(self):
 		self.db_set("status", "Cancelled")
+	
+	def check_if_payment_entry_exists(self):
+		if self.status == "Paid":
+			payment_entry = frappe.db.sql_list("""select parent from `tabPayment Entry Reference`
+				where reference_name=%s""", self.reference_name)
+			if payment_entry:
+				frappe.throw(_("Payment Entry already exists"), title=_('Error'))
 
 	def make_communication_entry(self):
 		"""Make communication entry"""
@@ -156,7 +179,33 @@ class PaymentRequest(Document):
 
 	def get_payment_success_url(self):
 		return self.payment_success_url
+	
+	def on_payment_authorized(self, status=None):
+		if not status:
+			return
+		
+		shopping_cart_settings = frappe.get_doc("Shopping Cart Settings")
 
+		if status in ["Authorized", "Completed"]:
+			redirect_to = None
+			self.run_method("set_as_paid")
+
+			# if shopping cart enabled and in session
+			if (shopping_cart_settings.enabled and hasattr(frappe.local, "session")
+				and frappe.local.session.user != "Guest"):
+
+				success_url = shopping_cart_settings.payment_success_url
+				if success_url:
+					redirect_to = ({
+						"Orders": "orders",
+						"Invoices": "invoices",
+						"My Account": "me"
+					}).get(success_url, "me")
+				else:
+					redirect_to = get_url("/orders/{0}".format(self.reference_name))
+			
+			return redirect_to
+			
 @frappe.whitelist(allow_guest=True)
 def make_payment_request(**args):
 	"""Make payment request"""
@@ -201,8 +250,9 @@ def make_payment_request(**args):
 			pr.submit()
 
 	if hasattr(ref_doc, "order_type") and getattr(ref_doc, "order_type") == "Shopping Cart":
-		generate_payment_request(pr.name)
 		frappe.db.commit()
+		frappe.local.response["type"] = "redirect"
+		frappe.local.response["location"] = pr.get_payment_url()
 
 	if not args.cart:
 		return pr
@@ -255,10 +305,6 @@ def get_print_format_list(ref_doctype):
 		"print_format": print_format_list
 	}
 
-@frappe.whitelist(allow_guest=True)
-def generate_payment_request(name):
-	frappe.get_doc("Payment Request", name).run_method("get_payment_url")
-
 @frappe.whitelist(allow_guest=True)
 def resend_payment_email(docname):
 	return frappe.get_doc("Payment Request", docname).send_email()
@@ -278,6 +324,7 @@ def make_status_as_paid(doc, method):
 			doc = frappe.get_doc("Payment Request", payment_request_name)
 			if doc.status != "Paid":
 				doc.db_set('status', 'Paid')
+				frappe.db.commit()
 
 def get_dummy_message(use_dummy_message=True):
 	return """

erpnext/accounts/doctype/payment_request/test_payment_request.py

@@ -9,7 +9,6 @@ from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_orde
 from erpnext.accounts.doctype.payment_request.payment_request import make_payment_request
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
 from erpnext.setup.utils import get_exchange_rate
-# test_records = frappe.get_test_records('Payment Request')
 
 test_dependencies = ["Currency Exchange", "Journal Entry", "Contact", "Address"]
 

erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js

@@ -30,7 +30,7 @@ frappe.ui.form.on('Period Closing Voucher', {
 					group_by_voucher: 0
 				};
 				frappe.set_route("query-report", "General Ledger");
-			}, "icon-table");
+			}, "fa fa-table");
 		}
 	}
 	

erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json

@@ -3,27 +3,35 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "PCE/.###", 
+ "beta": 0, 
  "creation": "2013-01-10 16:34:07", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "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_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -35,12 +43,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "transaction_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Transaction Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -48,7 +59,9 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -59,12 +72,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "posting_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Posting Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -72,7 +88,9 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -83,12 +101,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "fiscal_year", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Closing Fiscal Year", 
    "length": 0, 
    "no_copy": 0, 
@@ -97,7 +118,9 @@
    "options": "Fiscal Year", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -108,12 +131,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -122,7 +148,9 @@
    "options": "Period Closing Voucher", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -133,12 +161,15 @@
    "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_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -147,7 +178,9 @@
    "options": "Company", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -158,18 +191,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -180,13 +218,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "The account head under Liability or Equity, in which Profit/Loss will be booked", 
    "fieldname": "closing_account_head", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Closing Account Head", 
    "length": 0, 
    "no_copy": 0, 
@@ -195,7 +236,9 @@
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -206,12 +249,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "remarks", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Remarks", 
    "length": 0, 
    "no_copy": 0, 
@@ -219,7 +265,9 @@
    "oldfieldtype": "Small Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -229,15 +277,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-file-text", 
+ "icon": "fa fa-file-text", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:51.671436", 
+ "modified": "2016-11-07 05:32:15.691681", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Period Closing Voucher", 
@@ -253,6 +302,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -273,6 +323,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -284,10 +335,12 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "posting_date, fiscal_year", 
  "sort_field": "modified", 
  "sort_order": "DESC", 
- "title_field": "closing_account_head"
+ "title_field": "closing_account_head", 
+ "track_seen": 0
 }

erpnext/accounts/doctype/pos_customer_group/pos_customer_group.json

@@ -0,0 +1,66 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-11-16 15:27:16.413449", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "customer_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Customer Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Customer Group", 
+   "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
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-11-16 15:27:25.730507", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "POS Customer Group", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}

erpnext/accounts/doctype/pos_customer_group/pos_customer_group.py

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

erpnext/accounts/doctype/pos_item_group/pos_item_group.json

@@ -0,0 +1,66 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-11-16 15:26:47.706713", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "item_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Item Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item Group", 
+   "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
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-11-16 15:27:32.263630", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "POS Item Group", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}

erpnext/accounts/doctype/pos_item_group/pos_item_group.py

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

erpnext/accounts/doctype/pos_profile/pos_profile.json

@@ -14,6 +14,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "user", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -31,6 +32,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -41,6 +43,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "naming_series", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -58,6 +61,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -68,6 +72,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "1", 
    "description": "", 
    "fieldname": "update_stock", 
@@ -84,6 +89,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -94,6 +100,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "update_stock", 
    "fieldname": "warehouse", 
    "fieldtype": "Link", 
@@ -112,6 +119,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -122,6 +130,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "campaign", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -138,6 +147,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -148,31 +158,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "ignore_pricing_rule", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Ignore Pricing Rule", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_4", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -187,6 +173,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -197,6 +184,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "customer", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -214,6 +202,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -224,6 +213,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -241,6 +231,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 1, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -251,6 +242,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "currency", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -268,6 +260,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -278,14 +271,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "allow_partial_payment", 
+   "columns": 0, 
+   "fieldname": "ignore_pricing_rule", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Allow Partial Payment", 
+   "label": "Ignore Pricing Rule", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -293,6 +287,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -303,6 +298,61 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "allow_delete", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Allow Delete", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "allow_user_to_edit_rate", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Allow user to edit Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_11", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -317,6 +367,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -327,6 +378,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "payments", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -343,6 +395,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -353,6 +406,115 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_14", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "item_groups", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Item Groups", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "POS Item Group", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_16", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "customer_groups", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Customer Groups", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "POS Customer Group", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_16", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -367,6 +529,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -377,6 +540,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Point of Sale", 
    "fieldname": "print_format", 
    "fieldtype": "Link", 
@@ -394,6 +558,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -404,6 +569,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "letter_head", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -421,6 +587,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -431,6 +598,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "select_print_heading", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -448,6 +616,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -458,6 +627,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "tc_name", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -475,6 +645,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -485,6 +656,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -499,6 +671,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -509,32 +682,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "customer_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Customer Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Customer Group", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "territory", 
    "fieldtype": "Link", 
@@ -553,6 +701,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -563,6 +712,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "selling_price_list", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -580,6 +730,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -590,6 +741,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "apply_discount", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -605,6 +757,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -615,6 +768,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Grand Total", 
    "depends_on": "apply_discount", 
    "fieldname": "apply_discount_on", 
@@ -633,6 +787,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -643,6 +798,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_19", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -657,6 +813,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -667,6 +824,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "write_off_account", 
    "fieldtype": "Link", 
@@ -684,6 +842,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -694,6 +853,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "write_off_cost_center", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -710,6 +870,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -720,6 +881,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "account_for_change_amount", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -736,6 +898,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -746,6 +909,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "taxes_and_charges", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -763,6 +927,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -773,6 +938,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_23", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -787,6 +953,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -797,6 +964,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "income_account", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -814,6 +982,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -824,6 +993,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)", 
    "fieldname": "expense_account", 
    "fieldtype": "Link", 
@@ -840,6 +1010,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -850,6 +1021,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "cost_center", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -867,6 +1039,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -885,8 +1058,8 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-08-17 15:12:56.713748", 
- "modified_by": "Administrator", 
+ "modified": "2016-12-28 15:14:59.411457", 
+ "modified_by": "rohit@erpnext.com", 
  "module": "Accounts", 
  "name": "POS Profile", 
  "owner": "Administrator", 
@@ -901,6 +1074,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -921,6 +1095,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 

erpnext/accounts/doctype/pos_profile/pos_profile.py

@@ -13,6 +13,7 @@ class POSProfile(Document):
 	def validate(self):
 		self.check_for_duplicate()
 		self.validate_all_link_fields()
+		self.validate_duplicate_groups()
 
 	def check_for_duplicate(self):
 		res = frappe.db.sql("""select name, user from `tabPOS Profile`
@@ -37,6 +38,16 @@ class POSProfile(Document):
 						"company": self.company, "name": link_dn}):
 					frappe.throw(_("{0} does not belong to Company {1}").format(link_dn, self.company))
 
+	def validate_duplicate_groups(self):
+		item_groups = [d.item_group for d in self.item_groups]
+		customer_groups = [d.customer_group for d in self.customer_groups]
+
+		if len(item_groups) != len(set(item_groups)):
+			frappe.throw(_("Duplicate item group found in the item group table"), title = "Duplicate Item Group")
+
+		if len(customer_groups) != len(set(customer_groups)):
+			frappe.throw(_("Duplicate customer group found in the cutomer group table"), title = "Duplicate Customer Group")
+
 	def before_save(self):
 		set_account_for_mode_of_payment(self)
 

erpnext/accounts/doctype/pos_profile/test_pos_profile.py

@@ -5,8 +5,47 @@ from __future__ import unicode_literals
 
 import frappe
 import unittest
-
-# test_records = frappe.get_test_records('POS Profile')
+from erpnext.stock.get_item_details import get_pos_profile
+from erpnext.accounts.doctype.sales_invoice.pos import get_items_list, get_customers_list
 
 class TestPOSProfile(unittest.TestCase):
-	pass
+	def test_pos_profile(self):
+		make_pos_profile()
+
+		pos_profile = get_pos_profile("_Test Company") or {}
+		if pos_profile:
+			doc = frappe.get_doc("POS Profile", pos_profile.get("name"))
+			doc.append('item_groups', {'item_group': '_Test Item Group'})
+			doc.append('customer_groups', {'customer_group': '_Test Customer Group'})
+			doc.save()
+
+			items = get_items_list(doc)
+			customers = get_customers_list(doc)
+
+			products_count = frappe.db.sql(""" select count(name) from tabItem where item_group = '_Test Item Group'""", as_list=1)
+			customers_count = frappe.db.sql(""" select count(name) from tabCustomer where customer_group = '_Test Customer Group'""")
+
+			self.assertEquals(len(items), products_count[0][0])
+			self.assertEquals(len(customers), customers_count[0][0])
+
+		frappe.db.sql("delete from `tabPOS Profile`")
+
+def make_pos_profile():
+	pos_profile = frappe.get_doc({
+		"company": "_Test Company",
+		"cost_center": "_Test Cost Center - _TC",
+		"currency": "INR",
+		"doctype": "POS Profile",
+		"expense_account": "_Test Account Cost for Goods Sold - _TC",
+		"income_account": "Sales - _TC",
+		"name": "_Test POS Profile",
+		"naming_series": "_T-POS Profile-",
+		"selling_price_list": "_Test Price List",
+		"territory": "_Test Territory",
+		"warehouse": "_Test Warehouse - _TC",
+		"write_off_account": "_Test Write Off - _TC",
+		"write_off_cost_center": "_Test Write Off Cost Center - _TC"
+	})
+
+	if not frappe.db.exists("POS Profile", "_Test POS Profile"):
+		pos_profile.insert()

erpnext/accounts/doctype/pricing_rule/pricing_rule.js

@@ -4,7 +4,7 @@
 frappe.ui.form.on("Pricing Rule", "refresh", function(frm) {
 	var help_content = ['<table class="table table-bordered" style="background-color: #f9f9f9;">',
 		'<tr><td>',
-			'<h4><i class="icon-hand-right"></i> ',
+			'<h4><i class="fa fa-hand-right"></i> ',
 				__('Notes'),
 			':</h4>',
 			'<ul>',
@@ -23,7 +23,7 @@ frappe.ui.form.on("Pricing Rule", "refresh", function(frm) {
 			'</ul>',
 		'</td></tr>',
 		'<tr><td>',
-			'<h4><i class="icon-question-sign"></i> ',
+			'<h4><i class="fa fa-question-sign"></i> ',
 				__('How Pricing Rule is applied?'),
 			'</h4>',
 			'<ol>',

erpnext/accounts/doctype/pricing_rule/pricing_rule.json

@@ -3,16 +3,19 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:title", 
+ "beta": 0, 
  "creation": "2014-02-21 15:02:51", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "applicability_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -20,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -27,6 +31,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -37,6 +42,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "title", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -44,6 +50,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Title", 
    "length": 0, 
    "no_copy": 1, 
@@ -52,6 +59,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -62,6 +70,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Item Code", 
    "fieldname": "apply_on", 
    "fieldtype": "Select", 
@@ -70,6 +79,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Apply On", 
    "length": 0, 
    "no_copy": 0, 
@@ -78,6 +88,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -88,6 +99,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.apply_on==\"Item Code\"", 
    "fieldname": "item_code", 
    "fieldtype": "Link", 
@@ -96,6 +108,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -104,6 +117,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -114,6 +128,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.apply_on==\"Brand\"", 
    "fieldname": "brand", 
    "fieldtype": "Link", 
@@ -122,6 +137,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Brand", 
    "length": 0, 
    "no_copy": 0, 
@@ -130,6 +146,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -140,6 +157,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.apply_on==\"Item Group\"", 
    "fieldname": "item_group", 
    "fieldtype": "Link", 
@@ -148,6 +166,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Item Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -156,6 +175,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -166,6 +186,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_7", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -173,6 +194,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -180,6 +202,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -190,6 +213,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Higher the number, higher the priority", 
    "fieldname": "priority", 
    "fieldtype": "Select", 
@@ -198,6 +222,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Priority", 
    "length": 0, 
    "no_copy": 0, 
@@ -206,6 +231,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -216,6 +242,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "disable", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -223,6 +250,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Disable", 
    "length": 0, 
    "no_copy": 0, 
@@ -230,6 +258,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -240,6 +269,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_7", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -247,6 +277,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -254,6 +285,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -264,6 +296,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "selling", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -271,6 +304,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Selling", 
    "length": 0, 
    "no_copy": 0, 
@@ -278,6 +312,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -288,6 +323,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "buying", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -295,6 +331,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Buying", 
    "length": 0, 
    "no_copy": 0, 
@@ -302,6 +339,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -312,6 +350,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_11", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -319,6 +358,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -326,6 +366,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -336,6 +377,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval: doc.buying || doc.selling", 
    "fieldname": "applicable_for", 
    "fieldtype": "Select", 
@@ -344,6 +386,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Applicable For", 
    "length": 0, 
    "no_copy": 0, 
@@ -352,6 +395,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -362,6 +406,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.applicable_for==\"Customer\"", 
    "fieldname": "customer", 
    "fieldtype": "Link", 
@@ -370,6 +415,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer", 
    "length": 0, 
    "no_copy": 0, 
@@ -378,6 +424,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -388,6 +435,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.applicable_for==\"Customer Group\"", 
    "fieldname": "customer_group", 
    "fieldtype": "Link", 
@@ -396,6 +444,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -404,6 +453,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -414,6 +464,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.applicable_for==\"Territory\"", 
    "fieldname": "territory", 
    "fieldtype": "Link", 
@@ -422,6 +473,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Territory", 
    "length": 0, 
    "no_copy": 0, 
@@ -430,6 +482,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -440,6 +493,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.applicable_for==\"Sales Partner\"", 
    "fieldname": "sales_partner", 
    "fieldtype": "Link", 
@@ -448,6 +502,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Partner", 
    "length": 0, 
    "no_copy": 0, 
@@ -456,6 +511,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -466,6 +522,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.applicable_for==\"Campaign\"", 
    "fieldname": "campaign", 
    "fieldtype": "Link", 
@@ -474,6 +531,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Campaign", 
    "length": 0, 
    "no_copy": 0, 
@@ -482,6 +540,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -492,6 +551,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.applicable_for==\"Supplier\"", 
    "fieldname": "supplier", 
    "fieldtype": "Link", 
@@ -500,6 +560,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier", 
    "length": 0, 
    "no_copy": 0, 
@@ -508,6 +569,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -518,6 +580,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.applicable_for==\"Supplier Type\"", 
    "fieldname": "supplier_type", 
    "fieldtype": "Link", 
@@ -526,6 +589,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -534,6 +598,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -544,6 +609,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_19", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -551,6 +617,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -558,6 +625,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -568,6 +636,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "min_qty", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -575,6 +644,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Min Qty", 
    "length": 0, 
    "no_copy": 0, 
@@ -582,6 +652,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -592,6 +663,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_21", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -599,6 +671,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -606,6 +679,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -616,6 +690,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "max_qty", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -623,6 +698,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Max Qty", 
    "length": 0, 
    "no_copy": 0, 
@@ -630,6 +706,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -640,6 +717,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_23", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -647,6 +725,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -654,6 +733,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -664,6 +744,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Today", 
    "fieldname": "valid_from", 
    "fieldtype": "Date", 
@@ -672,6 +753,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Valid From", 
    "length": 0, 
    "no_copy": 0, 
@@ -679,6 +761,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -689,6 +772,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "valid_upto", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -696,6 +780,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Valid Upto", 
    "length": 0, 
    "no_copy": 0, 
@@ -703,6 +788,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -713,6 +799,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -720,12 +807,14 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -736,6 +825,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -743,6 +833,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -751,6 +842,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 1, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -761,6 +853,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval: doc.selling == 1", 
    "fieldname": "margin", 
    "fieldtype": "Section Break", 
@@ -769,6 +862,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Margin", 
    "length": 0, 
    "no_copy": 0, 
@@ -777,6 +871,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -787,6 +882,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Percentage", 
    "fieldname": "margin_type", 
    "fieldtype": "Select", 
@@ -795,6 +891,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Margin Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -804,6 +901,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -814,6 +912,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_33", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -821,6 +920,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -828,6 +928,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -838,6 +939,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "0", 
    "depends_on": "eval:doc.margin_type", 
    "fieldname": "margin_rate_or_amount", 
@@ -847,6 +949,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Margin Rate or Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -855,6 +958,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -865,6 +969,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "price_discount_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -872,6 +977,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -879,6 +985,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -889,6 +996,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Discount Percentage", 
    "fieldname": "price_or_discount", 
    "fieldtype": "Select", 
@@ -897,6 +1005,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price or Discount", 
    "length": 0, 
    "no_copy": 0, 
@@ -905,6 +1014,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -915,6 +1025,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break2", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -922,12 +1033,14 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -938,6 +1051,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.price_or_discount==\"Price\"", 
    "fieldname": "price", 
    "fieldtype": "Float", 
@@ -946,6 +1060,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price", 
    "length": 0, 
    "no_copy": 0, 
@@ -953,6 +1068,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -963,6 +1079,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.price_or_discount==\"Discount Percentage\"", 
    "fieldname": "discount_percentage", 
    "fieldtype": "Float", 
@@ -971,6 +1088,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Discount on Price List Rate (%)", 
    "length": 0, 
    "no_copy": 0, 
@@ -978,6 +1096,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -988,6 +1107,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.price_or_discount==\"Discount Percentage\"", 
    "fieldname": "for_price_list", 
    "fieldtype": "Link", 
@@ -996,6 +1116,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "For Price List", 
    "length": 0, 
    "no_copy": 0, 
@@ -1004,6 +1125,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1014,6 +1136,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "help_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1021,6 +1144,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -1029,6 +1153,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1039,6 +1164,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "pricing_rule_help", 
    "fieldtype": "HTML", 
    "hidden": 0, 
@@ -1046,6 +1172,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Pricing Rule Help", 
    "length": 0, 
    "no_copy": 0, 
@@ -1053,6 +1180,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1062,15 +1190,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-gift", 
+ "icon": "fa fa-gift", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-03-16 17:35:25.935271", 
+ "modified": "2016-11-07 05:19:31.478456", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Pricing Rule", 
@@ -1086,6 +1215,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -1106,6 +1236,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -1126,6 +1257,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -1146,6 +1278,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -1166,6 +1299,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -1177,9 +1311,11 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
- "title_field": ""
+ "title_field": "", 
+ "track_seen": 0
 }

erpnext/accounts/doctype/pricing_rule/pricing_rule.py

@@ -11,6 +11,7 @@ from frappe import throw, _
 from frappe.utils import flt, cint
 from frappe.model.document import Document
 
+
 class MultiplePricingRuleConflict(frappe.ValidationError): pass
 
 class PricingRule(Document):
@@ -108,13 +109,28 @@ def apply_pricing_rule(args):
 
 	item_list = args.get("items")
 	args.pop("items")
+	
+	set_serial_nos_based_on_fifo = frappe.db.get_single_value("Stock Settings", 
+		"automatically_set_serial_nos_based_on_fifo")
 
 	for item in item_list:
 		args_copy = copy.deepcopy(args)
 		args_copy.update(item)
 		out.append(get_pricing_rule_for_item(args_copy))
-
+		if set_serial_nos_based_on_fifo:
+			out.append(get_serial_no_for_item(args_copy))
 	return out
+	
+def get_serial_no_for_item(args):
+	from erpnext.stock.get_item_details import get_serial_no
+	item_details = frappe._dict({
+		"doctype": args.doctype,
+		"name": args.name,
+		"serial_no": args.serial_no
+	})
+	if args.get("parenttype") in ("Sales Invoice", "Delivery Note"):
+		item_details.serial_no = get_serial_no(args)
+	return item_details
 
 def get_pricing_rule_for_item(args):
 	if args.get("parenttype") == "Material Request": return {}
@@ -126,6 +142,8 @@ def get_pricing_rule_for_item(args):
 	})
 	
 	if args.ignore_pricing_rule or not args.item_code:
+		if frappe.db.exists(args.doctype, args.name) and args.get("pricing_rule"):
+			item_details = remove_pricing_rule(args, item_details)
 		return item_details
 
 	if not (args.item_group and args.brand):
@@ -165,6 +183,20 @@ def get_pricing_rule_for_item(args):
 			})
 		else:
 			item_details.discount_percentage = pricing_rule.discount_percentage
+	elif args.get('pricing_rule'):
+		item_details = remove_pricing_rule(args, item_details)
+
+	return item_details
+
+def remove_pricing_rule(args, item_details):
+	pricing_rule = frappe.db.get_value('Pricing Rule', args.get('pricing_rule'), ['price_or_discount', 'margin_type'], as_dict=1)
+	if pricing_rule and pricing_rule.price_or_discount == 'Discount Percentage':
+		item_details.discount_percentage = 0.0
+
+	if pricing_rule and pricing_rule.margin_type in ['Percentage', 'Amount']:
+		item_details.margin_rate_or_amount = 0.0
+		item_details.margin_type = None
+
 	return item_details
 
 def get_pricing_rules(args):
@@ -270,7 +302,7 @@ def filter_pricing_rules(args, pricing_rules):
 			pricing_rules = filter(lambda x: x.for_price_list==args.price_list, pricing_rules) \
 				or pricing_rules
 
-	if len(pricing_rules) > 1:
+	if len(pricing_rules) > 1 and not args.for_shopping_cart:
 		frappe.throw(_("Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}")
 			.format("\n".join([d.name for d in pricing_rules])), MultiplePricingRuleConflict)
 	elif pricing_rules:
@@ -304,4 +336,4 @@ def set_transaction_type(args):
 	elif args.customer:
 		args.transaction_type = "selling"
 	else:
-		args.transaction_type = "buying"
+		args.transaction_type = "buying"

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js

@@ -8,7 +8,7 @@ frappe.provide("erpnext.accounts");
 erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
 	onload: function() {
 		this._super();
-
+		
 		if(!this.frm.doc.__islocal) {
 			// show credit_to in print format
 			if(!this.frm.doc.supplier && this.frm.doc.credit_to) {
@@ -32,7 +32,7 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
 		if(doc.update_stock==1 && doc.docstatus==1) {
 			this.show_stock_ledger();
 		}
-
+		
 		if(!doc.is_return && doc.docstatus==1) {
 			if(doc.outstanding_amount != 0) {
 				this.frm.add_custom_button(__('Payment'), this.make_payment_entry, __("Make"));
@@ -198,7 +198,7 @@ function hide_fields(doc) {
 	item_fields_stock = ['warehouse_section', 'received_qty', 'rejected_qty'];
 
 	cur_frm.fields_dict['items'].grid.set_column_disp(item_fields_stock,
-		(cint(doc.update_stock)==1 ? true : false));
+		(cint(doc.update_stock)==1 || cint(doc.is_return)==1 ? true : false));
 
 	cur_frm.refresh_fields();
 }

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py

@@ -58,20 +58,21 @@ class PurchaseInvoice(BuyingController):
 		self.check_for_closed_status()
 		self.validate_with_previous_doc()
 		self.validate_uom_is_integer("uom", "qty")
-		self.set_expense_account()
+		self.set_expense_account(for_validate=True)
 		self.set_against_expense_account()
 		self.validate_write_off_account()
 		self.validate_multiple_billing("Purchase Receipt", "pr_detail", "amount", "items")
 		self.validate_fixed_asset()
 		self.validate_fixed_asset_account()
 		self.create_remarks()
+		self.set_status()
 
 	def validate_cash(self):
 		if not self.cash_bank_account and flt(self.paid_amount):
 			frappe.throw(_("Cash or Bank Account is mandatory for making payment entry"))
 
 		if flt(self.paid_amount) + flt(self.write_off_amount) \
-				- flt(self.base_grand_total) > 1/(10**(self.precision("base_grand_total") + 1)):
+				- flt(self.grand_total) > 1/(10**(self.precision("base_grand_total") + 1)):
 			frappe.throw(_("""Paid amount + Write Off Amount can not be greater than Grand Total"""))
 
 	def create_remarks(self):
@@ -155,7 +156,7 @@ class PurchaseInvoice(BuyingController):
 
 		super(PurchaseInvoice, self).validate_warehouse()
 
-	def set_expense_account(self):
+	def set_expense_account(self, for_validate=False):
 		auto_accounting_for_stock = cint(frappe.defaults.get_global_default("auto_accounting_for_stock"))
 
 		if auto_accounting_for_stock:
@@ -181,7 +182,7 @@ class PurchaseInvoice(BuyingController):
 				else:
 					item.expense_account = stock_not_billed_account
 
-			elif not item.expense_account:
+			elif not item.expense_account and for_validate:
 				throw(_("Expense account is mandatory for item {0}").format(item.item_code or item.item_name))
 
 	def set_against_expense_account(self):
@@ -305,25 +306,8 @@ class PurchaseInvoice(BuyingController):
 		if not self.grand_total:
 			return
 		
-		self.auto_accounting_for_stock = \
-			cint(frappe.defaults.get_global_default("auto_accounting_for_stock"))
-
-		self.stock_received_but_not_billed = self.get_company_default("stock_received_but_not_billed")
-		self.expenses_included_in_valuation = self.get_company_default("expenses_included_in_valuation")
-		self.negative_expense_to_be_booked = 0.0
-		gl_entries = []
-
-
-		self.make_supplier_gl_entry(gl_entries)
-		self.make_item_gl_entries(gl_entries)
-		self.make_tax_gl_entries(gl_entries)
-
-		gl_entries = merge_similar_entries(gl_entries)
-
-		self.make_payment_gl_entries(gl_entries)
-
-		self.make_write_off_gl_entry(gl_entries)
-
+		gl_entries = self.get_gl_entries()
+		
 		if gl_entries:
 			update_outstanding = "No" if (cint(self.is_paid) or self.write_off_account) else "Yes"
 
@@ -342,6 +326,26 @@ class PurchaseInvoice(BuyingController):
 		elif self.docstatus == 2 and cint(self.update_stock) and self.auto_accounting_for_stock:
 			delete_gl_entries(voucher_type=self.doctype, voucher_no=self.name)
 
+	def get_gl_entries(self, warehouse_account=None):
+		self.auto_accounting_for_stock = \
+			cint(frappe.defaults.get_global_default("auto_accounting_for_stock"))
+
+		self.stock_received_but_not_billed = self.get_company_default("stock_received_but_not_billed")
+		self.expenses_included_in_valuation = self.get_company_default("expenses_included_in_valuation")
+		self.negative_expense_to_be_booked = 0.0
+		gl_entries = []
+
+
+		self.make_supplier_gl_entry(gl_entries)
+		self.make_item_gl_entries(gl_entries)
+		self.make_tax_gl_entries(gl_entries)
+
+		gl_entries = merge_similar_entries(gl_entries)
+
+		self.make_payment_gl_entries(gl_entries)
+		self.make_write_off_gl_entry(gl_entries)
+		
+		return gl_entries
 
 	def make_supplier_gl_entry(self, gl_entries):
 		if self.grand_total:
@@ -372,7 +376,7 @@ class PurchaseInvoice(BuyingController):
 			if flt(item.base_net_amount):
 				account_currency = get_account_currency(item.expense_account)
 
-				if self.update_stock and self.auto_accounting_for_stock:
+				if self.update_stock and self.auto_accounting_for_stock and item.item_code in stock_items:
 					val_rate_db_precision = 6 if cint(item.precision("valuation_rate")) <= 6 else 9
 
 					# warehouse account
@@ -578,7 +582,8 @@ class PurchaseInvoice(BuyingController):
 
 		if not self.is_return:
 			from erpnext.accounts.utils import unlink_ref_doc_from_payment_entries
-			unlink_ref_doc_from_payment_entries(self.doctype, self.name)
+			if frappe.db.get_single_value('Accounts Settings', 'unlink_payment_on_cancellation_of_invoice'):
+				unlink_ref_doc_from_payment_entries(self)
 
 			self.update_prevdoc_status()
 			self.update_billing_status_for_zero_amount_refdoc("Purchase Order")
@@ -592,6 +597,7 @@ class PurchaseInvoice(BuyingController):
 		self.make_gl_entries_on_cancel()
 		self.update_project()
 		self.update_fixed_asset()
+		frappe.db.set(self, 'status', 'Cancelled')
 
 	def update_project(self):
 		project_list = []

erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py

@@ -1,31 +1,31 @@
 from frappe import _
 
-data = {
-	'fieldname': 'purchase_invoice',
-	'non_standard_fieldnames': {
-		'Delivery Note': 'against_sales_invoice',
-		'Journal Entry': 'reference_name',
-		'Payment Entry': 'reference_name',
-		'Payment Request': 'reference_name',
-		'Landed Cost Voucher': 'receipt_document',
-		'Purchase Invoice': 'return_against'
-	},
-	'internal_links': {
-		'Purchase Order': ['items', 'sales_order'],
-		'Purchase Receipt': ['items', 'delivery_note'],
-	},
-	'transactions': [
-		{
-			'label': _('Payment'),
-			'items': ['Payment Entry', 'Payment Request', 'Journal Entry']
+def get_data():
+	return {
+		'fieldname': 'purchase_invoice',
+		'non_standard_fieldnames': {
+			'Journal Entry': 'reference_name',
+			'Payment Entry': 'reference_name',
+			'Payment Request': 'reference_name',
+			'Landed Cost Voucher': 'receipt_document',
+			'Purchase Invoice': 'return_against'
 		},
-		{
-			'label': _('Reference'),
-			'items': ['Purchase Order', 'Purchase Receipt', 'Asset', 'Landed Cost Voucher']
+		'internal_links': {
+			'Purchase Order': ['items', 'purchase_order'],
+			'Purchase Receipt': ['items', 'purchase_receipt'],
 		},
-		{
-			'label': _('Returns'),
-			'items': ['Purchase Invoice']
-		},
-	]
-}
+		'transactions': [
+			{
+				'label': _('Payment'),
+				'items': ['Payment Entry', 'Payment Request', 'Journal Entry']
+			},
+			{
+				'label': _('Reference'),
+				'items': ['Purchase Order', 'Purchase Receipt', 'Asset', 'Landed Cost Voucher']
+			},
+			{
+				'label': _('Returns'),
+				'items': ['Purchase Invoice']
+			},
+		]
+	}

erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js

@@ -14,7 +14,9 @@ frappe.listview_settings['Purchase Invoice'] = {
 			} else {
 				return [__("Unpaid"), "orange", "outstanding_amount,>,0|due,>=,Today"];
 			}
-		} else if(flt(doc.outstanding_amount)==0 && doc.docstatus==1) {
+		} else if(flt(doc.outstanding_amount) < 0 && doc.docstatus == 1) {
+			return [__("Debit Note Issued"), "darkgrey", "outstanding_amount,<,0"]
+		}else if(flt(doc.outstanding_amount)==0 && doc.docstatus==1) {
 			return [__("Paid"), "green", "outstanding_amount,=,0"];
 		}
 	}

erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py

@@ -6,7 +6,7 @@ from __future__ import unicode_literals
 import unittest
 import frappe
 import frappe.model
-from frappe.utils import cint, flt, today
+from frappe.utils import cint, flt, today, nowdate
 import frappe.defaults
 from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory, \
 	test_records as pr_test_records
@@ -17,6 +17,12 @@ test_dependencies = ["Item", "Cost Center"]
 test_ignore = ["Serial No"]
 
 class TestPurchaseInvoice(unittest.TestCase):
+	def setUp(self):
+		unlink_payment_on_cancel_of_invoice()
+
+	def tearDown(self):
+		unlink_payment_on_cancel_of_invoice(0)
+
 	def test_gl_entries_without_auto_accounting_for_stock(self):
 		set_perpetual_inventory(0)
 		self.assertTrue(not cint(frappe.defaults.get_global_default("auto_accounting_for_stock")))
@@ -55,6 +61,27 @@ class TestPurchaseInvoice(unittest.TestCase):
 
 		set_perpetual_inventory(0)
 
+	def test_payment_entry_unlink_against_purchase_invoice(self):
+		from erpnext.accounts.doctype.payment_entry.test_payment_entry import get_payment_entry
+		unlink_payment_on_cancel_of_invoice(0)
+
+		pi_doc = make_purchase_invoice()
+
+		pe = get_payment_entry("Purchase Invoice", pi_doc.name, bank_account="_Test Bank - _TC")
+		pe.reference_no = "1"
+		pe.reference_date = nowdate()
+		pe.paid_from_account_currency = pi_doc.currency
+		pe.paid_to_account_currency = pi_doc.currency
+		pe.source_exchange_rate = 1
+		pe.target_exchange_rate = 1
+		pe.paid_amount = pi_doc.grand_total
+		pe.save(ignore_permissions=True)
+		pe.submit()
+
+		pi_doc = frappe.get_doc('Purchase Invoice', pi_doc.name)
+
+		self.assertRaises(frappe.LinkExistsError, pi_doc.cancel)
+
 	def test_gl_entries_with_auto_accounting_for_stock_against_pr(self):
 		set_perpetual_inventory(1)
 		self.assertEqual(cint(frappe.defaults.get_global_default("auto_accounting_for_stock")), 1)
@@ -410,6 +437,90 @@ class TestPurchaseInvoice(unittest.TestCase):
 
 		self.assertEquals(frappe.db.get_value("Serial No", pi.get("items")[0].rejected_serial_no,
 			"warehouse"), pi.get("items")[0].rejected_warehouse)
+	
+	def test_outstanding_amount_after_advance_jv_cancelation(self):
+		from erpnext.accounts.doctype.journal_entry.test_journal_entry \
+			import test_records as jv_test_records
+
+		jv = frappe.copy_doc(jv_test_records[1])
+		jv.insert()
+		jv.submit()
+
+		pi = frappe.copy_doc(test_records[0])
+		pi.append("advances", {
+			"reference_type": "Journal Entry",
+			"reference_name": jv.name,
+			"reference_row": jv.get("accounts")[0].name,
+			"advance_amount": 400,
+			"allocated_amount": 300,
+			"remarks": jv.remark
+		})
+		pi.insert()
+		pi.submit()
+		pi.load_from_db()
+		
+		#check outstanding after advance allocation
+		self.assertEqual(flt(pi.outstanding_amount), flt(pi.grand_total - pi.total_advance))
+		
+		#added to avoid Document has been modified exception
+		jv = frappe.get_doc("Journal Entry", jv.name)
+		jv.cancel()
+		
+		pi.load_from_db()
+		#check outstanding after advance cancellation
+		self.assertEqual(flt(pi.outstanding_amount), flt(pi.grand_total + pi.total_advance))
+
+	def test_outstanding_amount_after_advance_payment_entry_cancelation(self):
+		pe = frappe.get_doc({
+			"doctype": "Payment Entry",
+			"payment_type": "Pay",
+			"party_type": "Supplier",
+			"party": "_Test Supplier",
+			"company": "_Test Company",
+			"paid_from_account_currency": "INR",
+			"paid_to_account_currency": "INR",
+			"source_exchange_rate": 1,
+			"target_exchange_rate": 1,
+			"reference_no": "1",
+			"reference_date": nowdate(),
+			"received_amount": 300,
+			"paid_amount": 300,
+			"paid_from": "_Test Cash - _TC",
+			"paid_to": "_Test Payable - _TC"
+		})
+		pe.insert()
+		pe.submit()
+		
+		pi = frappe.copy_doc(test_records[0])
+		pi.is_pos = 0
+		pi.append("advances", {
+			"doctype": "Purchase Invoice Advance",
+			"reference_type": "Payment Entry",
+			"reference_name": pe.name,
+			"advance_amount": 300,
+			"allocated_amount": 300,
+			"remarks": pe.remarks
+		})
+		pi.insert()
+		pi.submit()
+		
+		pi.load_from_db()
+
+		#check outstanding after advance allocation
+		self.assertEqual(flt(pi.outstanding_amount), flt(pi.grand_total - pi.total_advance))
+		
+		#added to avoid Document has been modified exception
+		pe = frappe.get_doc("Payment Entry", pe.name)
+		pe.cancel()
+		
+		pi.load_from_db()
+		#check outstanding after advance cancellation
+		self.assertEqual(flt(pi.outstanding_amount), flt(pi.grand_total + pi.total_advance))
+
+def unlink_payment_on_cancel_of_invoice(enable=1):
+	accounts_settings = frappe.get_doc("Accounts Settings")
+	accounts_settings.unlink_payment_on_cancellation_of_invoice = enable
+	accounts_settings.save()
 
 def make_purchase_invoice(**args):
 	pi = frappe.new_doc("Purchase Invoice")
@@ -455,4 +566,4 @@ def make_purchase_invoice(**args):
 			pi.submit()
 	return pi
 
-test_records = frappe.get_test_records('Purchase Invoice')
+test_records = frappe.get_test_records('Purchase Invoice')

erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json

@@ -14,6 +14,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reference_type", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -43,6 +44,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 3, 
    "fieldname": "reference_name", 
    "fieldtype": "Dynamic Link", 
    "hidden": 0, 
@@ -69,6 +71,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 3, 
    "fieldname": "remarks", 
    "fieldtype": "Text", 
    "hidden": 0, 
@@ -97,6 +100,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reference_row", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -125,6 +129,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -148,6 +153,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "advance_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -177,6 +183,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "allocated_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -214,7 +221,7 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-07-18 05:13:42.137419", 
+ "modified": "2016-08-26 02:30:54.407138", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice Advance", 

erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json

@@ -8,12 +8,14 @@
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "document_type": "Setup", 
  "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Valuation and Total", 
    "fieldname": "category", 
    "fieldtype": "Select", 
@@ -42,6 +44,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Add", 
    "fieldname": "add_deduct_tax", 
    "fieldtype": "Select", 
@@ -70,6 +73,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "charge_type", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -97,6 +101,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:[\"On Previous Row Amount\", \"On Previous Row Total\"].indexOf(doc.charge_type)!==-1", 
    "fieldname": "row_id", 
    "fieldtype": "Data", 
@@ -124,6 +129,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "If checked, the tax amount will be considered as already included in the Print Rate / Print Amount", 
    "fieldname": "included_in_print_rate", 
    "fieldtype": "Check", 
@@ -150,6 +156,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -173,13 +180,14 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "account_head", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 0, 
+   "in_list_view": 1, 
    "label": "Account Head", 
    "length": 0, 
    "no_copy": 0, 
@@ -200,6 +208,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": ":Company", 
    "fieldname": "cost_center", 
    "fieldtype": "Link", 
@@ -228,13 +237,14 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "description", 
    "fieldtype": "Text Editor", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -256,6 +266,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_10", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -280,6 +291,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "rate", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -306,6 +318,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_9", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -330,6 +343,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "tax_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -357,6 +371,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "tax_amount_after_discount_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -383,13 +398,14 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 2, 
    "fieldname": "total", 
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 0, 
+   "in_list_view": 1, 
    "label": "Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -410,6 +426,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_14", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -434,6 +451,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_tax_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -460,6 +478,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_total", 
    "fieldtype": "Currency", 
    "hidden": 1, 
@@ -486,6 +505,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_tax_amount_after_discount_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -512,6 +532,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item_wise_tax_detail", 
    "fieldtype": "Code", 
    "hidden": 1, 
@@ -538,6 +559,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "parenttype", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -571,7 +593,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-11 03:28:06.117769", 
+ "modified": "2016-08-26 03:20:22.118330", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Taxes and Charges", 

erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json

@@ -3,23 +3,28 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:title", 
+ "beta": 0, 
  "creation": "2013-01-10 16:34:08", 
  "custom": 0, 
  "description": "Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like \"Shipping\", \"Insurance\", \"Handling\" etc.\n\n#### Note\n\nThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.\n\n#### Description of Columns\n\n1. Calculation Type: \n    - This can be on **Net Total** (that is the sum of basic amount).\n    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.\n    - **Actual** (as mentioned).\n2. Account Head: The Account ledger under which this tax will be booked\n3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.\n4. Description: Description of the tax (that will be printed in invoices / quotes).\n5. Rate: Tax rate.\n6. Amount: Tax amount.\n7. Total: Cumulative total to this point.\n8. Enter Row: If based on \"Previous Row Total\" you can select the row number which will be taken as a base for this calculation (default is the previous row).\n9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.\n10. Add or Deduct: Whether you want to add or deduct the tax.", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "title", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Title", 
    "length": 0, 
    "no_copy": 1, 
@@ -27,7 +32,9 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -38,18 +45,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "is_default", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Default", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -60,19 +72,24 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "disabled", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Disabled", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -83,19 +100,24 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break4", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -106,19 +128,24 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
    "options": "Company", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 1, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -129,19 +156,24 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break6", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -152,12 +184,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "taxes", 
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Purchase Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -166,7 +201,9 @@
    "options": "Purchase Taxes and Charges", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -176,15 +213,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-money", 
+ "icon": "fa fa-money", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:54.729312", 
+ "modified": "2016-11-07 05:18:44.095798", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Taxes and Charges Template", 
@@ -200,6 +238,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -220,6 +259,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -240,6 +280,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -251,6 +292,9 @@
    "write": 0
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "sort_order": "DESC", 
+ "track_seen": 0
 }

erpnext/accounts/doctype/salary_component_account/salary_component_account.json

@@ -0,0 +1,92 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-07-27 17:24:24.956896", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "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_list_view": 1, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.", 
+   "fieldname": "default_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Default Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-09-02 07:49:06.567389", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Salary Component Account", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}

erpnext/accounts/doctype/salary_component_account/salary_component_account.py

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

erpnext/accounts/doctype/sales_invoice/pos.py

@@ -3,7 +3,6 @@
 
 from __future__ import unicode_literals
 import frappe, json
-from frappe import _
 from frappe.utils import nowdate
 from erpnext.setup.utils import get_exchange_rate
 from erpnext.stock.get_item_details import get_pos_profile
@@ -15,13 +14,11 @@ def get_pos_data():
 	doc = frappe.new_doc('Sales Invoice')
 	doc.is_pos = 1;
 	pos_profile = get_pos_profile(doc.company) or {}
+	if not doc.company: doc.company = pos_profile.get('company')
 	doc.update_stock = pos_profile.get('update_stock')
 
 	if pos_profile.get('name'):
 		pos_profile = frappe.get_doc('POS Profile', pos_profile.get('name'))
-	else:
-		frappe.msgprint('<a href="#List/POS Profile">'
-			+ _("Welcome to POS: Create your POS Profile") + '</a>');
 
 	company_data = get_company_data(doc.company)
 	update_pos_profile_data(doc, pos_profile, company_data)
@@ -32,17 +29,31 @@ def get_pos_data():
 	return {
 		'doc': doc,
 		'default_customer': pos_profile.get('customer'),
-		'items': get_items(doc, pos_profile),
-		'customers': get_customers(pos_profile, doc, company_data.default_currency),
-		'pricing_rules': get_pricing_rules(doc),
+		'items': get_items_list(pos_profile),
+		'customers': get_customers_list(pos_profile),
+		'serial_no_data': get_serial_no_data(pos_profile, doc.company),
+		'batch_no_data': get_batch_no_data(),
+		'tax_data': get_item_tax_data(),
+		'price_list_data': get_price_list_data(doc.selling_price_list),
+		'bin_data': get_bin_data(pos_profile),
+		'pricing_rules': get_pricing_rule_data(doc),
 		'print_template': print_template,
-		'meta': {
-			'invoice': frappe.get_meta('Sales Invoice'),
-			'items': frappe.get_meta('Sales Invoice Item'),
-			'taxes': frappe.get_meta('Sales Taxes and Charges')
-		}
+		'pos_profile': pos_profile,
+		'meta': get_meta()
 	}
 
+def get_meta():
+	doctype_meta = {
+		'customer': frappe.get_meta('Customer'),
+		'invoice': frappe.get_meta('Sales Invoice')
+	}
+
+	for row in frappe.get_all('DocField', fields = ['fieldname', 'options'],
+		filters = {'parent': 'Sales Invoice', 'fieldtype': 'Table'}):
+		doctype_meta[row.fieldname] = frappe.get_meta(row.options)
+
+	return doctype_meta
+
 def get_company_data(company):
 	return frappe.get_all('Company', fields = ["*"], filters= {'name': company})[0]
 
@@ -59,16 +70,19 @@ def update_pos_profile_data(doc, pos_profile, company_data):
 
 	doc.currency = pos_profile.get('currency') or company_data.default_currency
 	doc.conversion_rate = 1.0
+
 	if doc.currency != company_data.default_currency:
-		doc.conversion_rate = get_exchange_rate(doc.currency, company_data.default_currency)
+		doc.conversion_rate = get_exchange_rate(doc.currency, company_data.default_currency, doc.posting_date)
+
 	doc.selling_price_list = pos_profile.get('selling_price_list') or \
 		frappe.db.get_value('Selling Settings', None, 'selling_price_list')
 	doc.naming_series = pos_profile.get('naming_series') or 'SINV-'
 	doc.letter_head = pos_profile.get('letter_head') or company_data.default_letter_head
 	doc.ignore_pricing_rule = pos_profile.get('ignore_pricing_rule') or 0
-	doc.apply_discount_on = pos_profile.get('apply_discount_on') or ''
+	doc.apply_discount_on = pos_profile.get('apply_discount_on') if pos_profile.get('apply_discount') else ''
 	doc.customer_group = pos_profile.get('customer_group') or get_root('Customer Group')
 	doc.territory = pos_profile.get('territory') or get_root('Territory')
+	doc.terms = frappe.db.get_value('Terms and Conditions', pos_profile.get('tc_name'), 'terms') or doc.terms or ''
 
 def get_root(table):
 	root = frappe.db.sql(""" select name from `tab%(table)s` having
@@ -106,63 +120,122 @@ def update_tax_table(doc):
 	for tax in taxes:
 		doc.append('taxes', tax)
 
-def get_items(doc, pos_profile):
-	item_list = []
-	for item in frappe.get_all("Item", fields=["*"], filters={'disabled': 0, 'has_variants': 0, 'is_sales_item': 1}):
-		item_doc = frappe.get_doc('Item', item.name)
-		if item_doc.taxes:
-			item.taxes = json.dumps(dict(([d.tax_type, d.tax_rate] for d in
-						item_doc.get("taxes"))))
+def get_items_list(pos_profile):
+	cond = "1=1"
+	item_groups = []
+	if pos_profile.get('item_groups'):
+		# Get items based on the item groups defined in the POS profile
+		for d in pos_profile.get('item_groups'):
+			item_groups.extend(get_child_nodes('Item Group', d.item_group))
+		cond = "item_group in (%s)"%(', '.join(['%s']*len(item_groups)))
 
-		item.price_list_rate = frappe.db.get_value('Item Price', {'item_code': item.name,
-									'price_list': doc.selling_price_list}, 'price_list_rate') or 0
-		item.default_warehouse = pos_profile.get('warehouse') or \
-			get_item_warehouse_for_company(doc.company, item.default_warehouse) or None
-		item.expense_account = pos_profile.get('expense_account') or item.expense_account
-		item.income_account = pos_profile.get('income_account') or item_doc.income_account
-		item.cost_center = pos_profile.get('cost_center') or item_doc.selling_cost_center
-		item.actual_qty = frappe.db.get_value('Bin', {'item_code': item.name,
-								'warehouse': item.default_warehouse}, 'actual_qty') or 0
-		item.serial_nos = get_serial_nos(item, pos_profile, doc.company)
-		item.batch_nos = frappe.db.sql_list("""select name from `tabBatch` where ifnull(expiry_date, '4000-10-10') > curdate()
-			and item = %(item_code)s""", {'item_code': item.item_code})
+	return frappe.db.sql(""" 
+		select
+			name, item_code, item_name, description, item_group, expense_account, has_batch_no,
+			has_serial_no, expense_account, selling_cost_center, stock_uom, image, 
+			default_warehouse, is_stock_item, barcode
+		from
+			tabItem
+		where
+			disabled = 0 and has_variants = 0 and is_sales_item = 1 and {cond}
+		""".format(cond=cond), tuple(item_groups), as_dict=1)
 
-		item_list.append(item)
+def get_customers_list(pos_profile):
+	cond = "1=1"
+	customer_groups = []
+	if pos_profile.get('customer_groups'):
+		# Get customers based on the customer groups defined in the POS profile
+		for d in pos_profile.get('customer_groups'):
+			customer_groups.extend(get_child_nodes('Customer Group', d.customer_group))
+		cond = "customer_group in (%s)"%(', '.join(['%s']*len(customer_groups)))
 
-	return item_list
+	return frappe.db.sql(""" select name, customer_name, customer_group,
+		territory from tabCustomer where disabled = 0
+		and {cond}""".format(cond=cond), tuple(customer_groups), as_dict=1) or {}
 
-def get_item_warehouse_for_company(company, warehouse):
-	if frappe.db.get_value('Warehouse', warehouse, 'company') != company:
-		warehouse = None
-	return warehouse
+def get_child_nodes(group_type, root):
+	lft, rgt = frappe.db.get_value(group_type, root, ["lft", "rgt"])
+	return frappe.db.sql_list(""" Select name from `tab{tab}` where
+			lft >= {lft} and rgt <= {rgt}""".format(tab=group_type, lft=lft, rgt=rgt))
+
+def get_serial_no_data(pos_profile, company):
+	# get itemwise serial no data
+	# example {'Nokia Lumia 1020': {'SN0001': 'Pune'}}
+	# where Nokia Lumia 1020 is item code, SN0001 is serial no and Pune is warehouse
 
-def get_serial_nos(item, pos_profile, company):
 	cond = "1=1"
 	if pos_profile.get('update_stock') and pos_profile.get('warehouse'):
 		cond = "warehouse = '{0}'".format(pos_profile.get('warehouse'))
 
-	serial_nos = frappe.db.sql("""select name, warehouse from `tabSerial No` where {0}
-				and item_code = %(item_code)s and company = %(company)s
-				""".format(cond), {'item_code': item.item_code, 'company': company}, as_dict=1)
+	serial_nos = frappe.db.sql("""select name, warehouse, item_code from `tabSerial No` where {0}
+				and company = %(company)s """.format(cond), {'company': company}, as_dict=1)
 
-	serial_no_list = {}
-	for serial_no in serial_nos:
-		serial_no_list[serial_no.name] = serial_no.warehouse
+	itemwise_serial_no = {}
+	for sn in serial_nos:
+		if sn.item_code not in itemwise_serial_no:
+			itemwise_serial_no.setdefault(sn.item_code, {})
+		itemwise_serial_no[sn.item_code][sn.name] = sn.warehouse
 
-	return serial_no_list
+	return itemwise_serial_no
 
-def get_customers(pos_profile, doc, company_currency):
-	filters = {'disabled': 0}
-	customer_list = []
-	customers = frappe.get_all("Customer", fields=["*"], filters = filters)
+def get_batch_no_data():
+	# get itemwise batch no data
+	# exmaple: {'LED-GRE': [Batch001, Batch002]}
+	# where LED-GRE is item code, SN0001 is serial no and Pune is warehouse
 
-	for customer in customers:
-		customer_currency = get_party_account_currency('Customer', customer.name, doc.company) or doc.currency
-		if customer_currency == doc.currency or customer_currency == company_currency:
-			customer_list.append(customer)
-	return customer_list
+	itemwise_batch = {}
+	batches = frappe.db.sql("""select name, item from `tabBatch`
+		where ifnull(expiry_date, '4000-10-10') >= curdate()""", as_dict=1)
 
-def get_pricing_rules(doc):
+	for batch in batches:
+		if batch.item not in itemwise_batch:
+			itemwise_batch.setdefault(batch.item, [])
+		itemwise_batch[batch.item].append(batch.name)
+
+	return itemwise_batch
+
+def get_item_tax_data():
+	# get default tax of an item
+	# example: {'Consulting Services': {'Excise 12 - TS': '12.000'}}
+
+	itemwise_tax = {}
+	taxes = frappe.db.sql(""" select parent, tax_type, tax_rate from `tabItem Tax`""", as_dict=1)
+
+	for tax in taxes:
+		if tax.parent not in itemwise_tax:
+			itemwise_tax.setdefault(tax.parent, {})
+		itemwise_tax[tax.parent][tax.tax_type] = tax.tax_rate
+
+	return itemwise_tax
+
+def get_price_list_data(selling_price_list):
+	itemwise_price_list = {}
+	price_lists = frappe.db.sql("""Select ifnull(price_list_rate, 0) as price_list_rate,
+		item_code from `tabItem Price` ip where price_list = %(price_list)s""",
+		{'price_list': selling_price_list}, as_dict=1)
+
+	for item in price_lists:
+		itemwise_price_list[item.item_code] = item.price_list_rate
+
+	return itemwise_price_list
+
+def get_bin_data(pos_profile):
+	itemwise_bin_data = {}
+	cond = "1=1"
+	if pos_profile.get('warehouse'):
+		cond = "warehouse = '{0}'".format(pos_profile.get('warehouse'))
+
+	bin_data = frappe.db.sql(""" select item_code, warehouse, actual_qty from `tabBin`
+		where actual_qty > 0 and {cond}""".format(cond=cond), as_dict=1)
+
+	for bins in bin_data:
+		if bins.item_code not in itemwise_bin_data:
+			itemwise_bin_data.setdefault(bins.item_code, {})
+		itemwise_bin_data[bins.item_code][bins.warehouse] = bins.actual_qty
+
+	return itemwise_bin_data
+
+def get_pricing_rule_data(doc):
 	pricing_rules = ""
 	if doc.ignore_pricing_rule == 0:
 		pricing_rules = frappe.db.sql(""" Select * from `tabPricing Rule` where docstatus < 2
@@ -182,8 +255,7 @@ def make_invoice(doc_list):
 
 	for docs in doc_list:
 		for name, doc in docs.items():
-			if not frappe.db.exists('Sales Invoice',
-				{'offline_pos_name': name, 'docstatus': ("<", "2")}):
+			if not frappe.db.exists('Sales Invoice', {'offline_pos_name': name}):
 				validate_records(doc)
 				si_doc = frappe.new_doc('Sales Invoice')
 				si_doc.offline_pos_name = name
@@ -228,6 +300,7 @@ def submit_invoice(si_doc, name):
 	try:
 		si_doc.insert()
 		si_doc.submit()
+		frappe.db.commit()
 	except Exception, e:
 		if frappe.message_log: frappe.message_log.pop()
 		frappe.db.rollback()
@@ -238,10 +311,3 @@ def save_invoice(e, si_doc, name):
 		si_doc.docstatus = 0
 		si_doc.flags.ignore_mandatory = True
 		si_doc.insert()
-		make_scheduler_log(e, si_doc.name)
-
-def make_scheduler_log(e, sales_invoice):
-	scheduler_log = frappe.new_doc('Scheduler Log')
-	scheduler_log.error = e
-	scheduler_log.sales_invoice = sales_invoice
-	scheduler_log.save(ignore_permissions=True)

erpnext/accounts/doctype/sales_invoice/sales_invoice.js

@@ -20,6 +20,13 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
 		erpnext.queries.setup_queries(this.frm, "Warehouse", function() {
 			return erpnext.queries.warehouse(me.frm.doc);
 		});
+
+		if(this.frm.doc.__islocal && this.frm.doc.is_pos) {
+			//Load pos profile data on the invoice if the default value of Is POS is 1
+
+			me.frm.script_manager.trigger("is_pos");
+			me.frm.refresh_fields();
+		}
 	},
 
 	refresh: function(doc, dt, dn) {
@@ -263,6 +270,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
 				});
 			}
 		}
+		else this.frm.trigger("refresh")
 	},
 
 	amount: function(){
@@ -300,7 +308,7 @@ cur_frm.cscript.hide_fields = function(doc) {
 
 	item_fields_stock = ['serial_no', 'batch_no', 'actual_qty', 'expense_account', 'warehouse', 'expense_account', 'warehouse']
 	cur_frm.fields_dict['items'].grid.set_column_disp(item_fields_stock,
-		(cint(doc.update_stock)==1 ? true : false));
+		(cint(doc.update_stock)==1 || cint(doc.is_return)==1 ? true : false));
 
 	// India related fields
 	if (frappe.boot.sysdefaults.country == 'India') unhide_field(['c_form_applicable', 'c_form_no']);
@@ -462,25 +470,57 @@ cur_frm.set_query("asset", "items", function(doc, cdt, cdn) {
 frappe.ui.form.on('Sales Invoice', {
 	setup: function(frm){
 		frm.fields_dict["timesheets"].grid.get_field("time_sheet").get_query = function(doc, cdt, cdn){
-			return {
-				filters: [
-					["Timesheet", "status", "in", ["Submitted", "Payslip"]]
-				]
+			return{
+				query: "erpnext.projects.doctype.timesheet.timesheet.get_timesheet",
+				filters: {'project': doc.project}
 			}
 		}
-	}
-})
+	},
 
-frappe.ui.form.on('Sales Invoice Timesheet', {
-	time_sheet: function(frm){
+	project: function(frm){
 		frm.call({
-			method: "calculate_billing_amount_from_timesheet",
+			method: "add_timesheet_data",
 			doc: frm.doc,
 			callback: function(r, rt) {
-				refresh_field('total_billing_amount')
+				refresh_field(['timesheets'])
 			}
 		})
 	}
 })
 
-cur_frm.add_fetch("time_sheet", "total_billing_amount", "billing_amount");
+frappe.ui.form.on('Sales Invoice Timesheet', {
+	time_sheet: function(frm, cdt, cdn){
+		var d = locals[cdt][cdn];
+		if(d.time_sheet) {
+			frappe.call({
+				method: "erpnext.projects.doctype.timesheet.timesheet.get_timesheet_data",
+				args: {
+					'name': d.time_sheet,
+					'project': frm.doc.project || null
+				},
+				callback: function(r, rt) {
+					if(r.message){
+						data = r.message;
+						frappe.model.set_value(cdt, cdn, "billing_hours", data.billing_hours);
+						frappe.model.set_value(cdt, cdn, "billing_amount", data.billing_amount);
+						frappe.model.set_value(cdt, cdn, "timesheet_detail", data.timesheet_detail);
+						calculate_total_billing_amount(frm)
+					}
+				}
+			})
+		}
+	}
+})
+
+var calculate_total_billing_amount =  function(frm) {
+	var doc = frm.doc;
+
+	doc.total_billing_amount = 0.0
+	if(doc.timesheets) {
+		$.each(doc.timesheets, function(index, data){
+			doc.total_billing_amount += data.billing_amount
+		})
+	}
+
+	refresh_field('total_billing_amount')
+}

erpnext/accounts/doctype/sales_invoice/sales_invoice.py

@@ -14,6 +14,7 @@ from erpnext.accounts.doctype.sales_invoice.pos import update_multi_mode_option
 from erpnext.controllers.selling_controller import SellingController
 from erpnext.accounts.utils import get_account_currency
 from erpnext.stock.doctype.delivery_note.delivery_note import update_billed_amount_based_on_so
+from erpnext.projects.doctype.timesheet.timesheet import get_projectwise_timesheet_data
 from erpnext.accounts.doctype.asset.depreciation \
 	import get_disposal_account_and_cost_center, get_gl_entries_on_asset_disposal
 
@@ -83,7 +84,9 @@ class SalesInvoice(SellingController):
 		self.validate_time_sheets_are_submitted()
 		self.validate_multiple_billing("Delivery Note", "dn_detail", "amount", "items")
 		self.update_packing_list()
-		self.calculate_billing_amount_from_timesheet()
+		self.set_billing_hours_and_amount()
+		self.update_timesheet_billing_for_project()
+		self.set_status()
 
 	def before_save(self):
 		set_account_for_mode_of_payment(self)
@@ -134,7 +137,8 @@ class SalesInvoice(SellingController):
 		self.check_close_sales_order("sales_order")
 
 		from erpnext.accounts.utils import unlink_ref_doc_from_payment_entries
-		unlink_ref_doc_from_payment_entries(self.doctype, self.name)
+		if frappe.db.get_single_value('Accounts Settings', 'unlink_payment_on_cancellation_of_invoice'):
+			unlink_ref_doc_from_payment_entries(self)
 
 		if self.is_return:
 			# NOTE status updating bypassed for is_return
@@ -155,6 +159,7 @@ class SalesInvoice(SellingController):
 			self.update_stock_ledger()
 
 		self.make_gl_entries_on_cancel()
+		frappe.db.set(self, 'status', 'Cancelled')
 
 	def update_status_updater_args(self):
 		if cint(self.update_stock):
@@ -220,11 +225,21 @@ class SalesInvoice(SellingController):
 		for d in self.timesheets:
 			if d.time_sheet:
 				timesheet = frappe.get_doc("Timesheet", d.time_sheet)
-				timesheet.sales_invoice = sales_invoice
+				self.update_time_sheet_detail(timesheet, d, sales_invoice)
+				timesheet.calculate_total_amounts()
+				timesheet.calculate_percentage_billed()
 				timesheet.flags.ignore_validate_update_after_submit = True
 				timesheet.set_status()
 				timesheet.save()
 
+	def update_time_sheet_detail(self, timesheet, args, sales_invoice):
+		for data in timesheet.time_logs:
+			if (self.project and args.timesheet_detail == data.name) or \
+				(not self.project and not data.sales_invoice) or \
+				(not sales_invoice and data.sales_invoice == self.name):
+				data.sales_invoice = sales_invoice
+				if self.project: return
+
 	def on_update(self):
 		self.set_paid_amount()
 
@@ -350,19 +365,18 @@ class SalesInvoice(SellingController):
 				against_acc.append(d.income_account)
 		self.against_income_account = ','.join(against_acc)
 
-
 	def add_remarks(self):
 		if not self.remarks: self.remarks = 'No Remarks'
 
 
 	def so_dn_required(self):
 		"""check in manage account if sales order / delivery note required or not."""
-		dic = {'Sales Order':'so_required','Delivery Note':'dn_required'}
+		dic = {'Sales Order':['so_required', 'is_pos'],'Delivery Note':['dn_required', 'update_stock']}
 		for i in dic:
-			if frappe.db.get_value('Selling Settings', None, dic[i]) == 'Yes':
+			if frappe.db.get_value('Selling Settings', None, dic[i][0]) == 'Yes':
 				for d in self.get('items'):
 					if frappe.db.get_value('Item', d.item_code, 'is_stock_item') == 1 \
-						and not d.get(i.lower().replace(' ','_')):
+						and not d.get(i.lower().replace(' ','_')) and not self.get(dic[i][1]):
 						msgprint(_("{0} is mandatory for Item {1}").format(i,d.item_code), raise_exception=1)
 
 
@@ -389,9 +403,9 @@ class SalesInvoice(SellingController):
 	def validate_warehouse(self):
 		super(SalesInvoice, self).validate_warehouse()
 
-		for d in self.get('items'):
-			if not d.warehouse:
-				frappe.throw(_("Warehouse required at Row No {0}").format(d.idx))
+		for d in self.get_item_list():
+			if not d.warehouse and frappe.db.get_value("Item", d.item_code, "is_stock_item"):
+				frappe.throw(_("Warehouse required for stock Item {0}").format(d.item_code))
 
 	def validate_delivery_note(self):
 		for d in self.get("items"):
@@ -447,7 +461,35 @@ class SalesInvoice(SellingController):
 		else:
 			self.set('packed_items', [])
 
-	def calculate_billing_amount_from_timesheet(self):
+	def set_billing_hours_and_amount(self):
+		for timesheet in self.timesheets:
+			ts_doc = frappe.get_doc('Timesheet', timesheet.time_sheet)
+			if not timesheet.billing_hours and ts_doc.total_billable_hours:
+				timesheet.billing_hours = ts_doc.total_billable_hours
+
+			if not timesheet.billing_amount and ts_doc.total_billable_amount:
+				timesheet.billing_amount = ts_doc.total_billable_amount
+
+	def update_timesheet_billing_for_project(self):
+		if not self.timesheets and self.project:
+			self.add_timesheet_data()
+		else:
+			self.calculate_billing_amount_for_timesheet()
+
+	def add_timesheet_data(self):
+		self.set('timesheets', [])
+		if self.project:
+			for data in get_projectwise_timesheet_data(self.project):
+				self.append('timesheets', {
+						'time_sheet': data.parent,
+						'billing_hours': data.billing_hours,
+						'billing_amount': data.billing_amt,
+						'timesheet_detail': data.name
+					})
+
+			self.calculate_billing_amount_for_timesheet()
+
+	def calculate_billing_amount_for_timesheet(self):
 		total_billing_amount = 0.0
 		for data in self.timesheets:
 			if data.billing_amount:
@@ -609,32 +651,34 @@ class SalesInvoice(SellingController):
 	def make_pos_gl_entries(self, gl_entries):
 		if cint(self.is_pos):
 			for payment_mode in self.payments:
-				# POS, make payment entries
-				gl_entries.append(
-					self.get_gl_dict({
-						"account": self.debit_to,
-						"party_type": "Customer",
-						"party": self.customer,
-						"against": payment_mode.account,
-						"credit": payment_mode.base_amount,
-						"credit_in_account_currency": payment_mode.base_amount \
-							if self.party_account_currency==self.company_currency \
-							else payment_mode.amount,
-						"against_voucher": self.return_against if cint(self.is_return) else self.name,
-						"against_voucher_type": self.doctype,
-					}, self.party_account_currency)
-				)
+				if payment_mode.amount:
+					# POS, make payment entries
+					gl_entries.append(
+						self.get_gl_dict({
+							"account": self.debit_to,
+							"party_type": "Customer",
+							"party": self.customer,
+							"against": payment_mode.account,
+							"credit": payment_mode.base_amount,
+							"credit_in_account_currency": payment_mode.base_amount \
+								if self.party_account_currency==self.company_currency \
+								else payment_mode.amount,
+							"against_voucher": self.return_against if cint(self.is_return) else self.name,
+							"against_voucher_type": self.doctype,
+						}, self.party_account_currency)
+					)
 
-				payment_mode_account_currency = get_account_currency(payment_mode.account)
-				gl_entries.append(
-					self.get_gl_dict({
-						"account": payment_mode.account,
-						"against": self.customer,
-						"debit": payment_mode.base_amount,
-						"debit_in_account_currency": payment_mode.base_amount \
-							if payment_mode_account_currency==self.company_currency else payment_mode.amount
-					}, payment_mode_account_currency)
-				)
+					payment_mode_account_currency = get_account_currency(payment_mode.account)
+					gl_entries.append(
+						self.get_gl_dict({
+							"account": payment_mode.account,
+							"against": self.customer,
+							"debit": payment_mode.base_amount,
+							"debit_in_account_currency": payment_mode.base_amount \
+								if payment_mode_account_currency==self.company_currency \
+								else payment_mode.amount
+						}, payment_mode_account_currency)
+					)
 				
 	def make_gle_for_change_amount(self, gl_entries):
 		if cint(self.is_pos) and self.change_amount:

erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py

@@ -1,30 +1,31 @@
 from frappe import _
 
-data = {
-	'fieldname': 'sales_invoice',
-	'non_standard_fieldnames': {
-		'Delivery Note': 'against_sales_invoice',
-		'Journal Entry': 'reference_name',
-		'Payment Entry': 'reference_name',
-		'Payment Request': 'reference_name',
-		'Sales Invoice': 'return_against'
-	},
-	'internal_links': {
-		'Sales Order': ['items', 'sales_order'],
-		'Delivery Note': ['items', 'delivery_note'],
-	},
-	'transactions': [
-		{
-			'label': _('Payment'),
-			'items': ['Payment Entry', 'Payment Request', 'Journal Entry']
+def get_data():
+	return {
+		'fieldname': 'sales_invoice',
+		'non_standard_fieldnames': {
+			'Delivery Note': 'against_sales_invoice',
+			'Journal Entry': 'reference_name',
+			'Payment Entry': 'reference_name',
+			'Payment Request': 'reference_name',
+			'Sales Invoice': 'return_against'
 		},
-		{
-			'label': _('Reference'),
-			'items': ['Timesheet', 'Delivery Note', 'Sales Order']
+		'internal_links': {
+			'Sales Order': ['items', 'sales_order'],
+			'Delivery Note': ['items', 'delivery_note'],
 		},
-		{
-			'label': _('Returns'),
-			'items': ['Sales Invoice']
-		},
-	]
-}
+		'transactions': [
+			{
+				'label': _('Payment'),
+				'items': ['Payment Entry', 'Payment Request', 'Journal Entry']
+			},
+			{
+				'label': _('Reference'),
+				'items': ['Timesheet', 'Delivery Note', 'Sales Order']
+			},
+			{
+				'label': _('Returns'),
+				'items': ['Sales Invoice']
+			},
+		]
+	}