Merge branch 'hotfix'

bumped to version 7.1.3
Merge pull request #6763 from rohitwaghchaure/documentation
2016-10-31 16:37:29 +05:30 · 2016-10-31 17:07:29 +06:00 · 2016-10-31 16:35:54 +05:30 · 2016-10-31 16:34:35 +05:30 · 2016-10-31 16:17:10 +05:30 · 2016-10-31 15:40:59 +05:30
635 changed files with 108302 additions and 47092 deletions
--- a/erpnext/init.py
+++ b/erpnext/init.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe

-__version__ = '7.0.35'
+__version__ = '7.1.3'

 def get_default_company(user=None):
 	'''Get default company for user'''
--- a/erpnext/accounts/doctype/account/account.py
+++ b/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)
--- a/erpnext/accounts/doctype/account/account_tree.js
+++ b/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"),
@@ -33,10 +35,19 @@ frappe.treeview_settings["Account"] = {
 		{fieldtype:'Float', fieldname:'tax_rate', label:__('Tax Rate'),
 			depends_on: 'eval:doc.is_group==1&&doc.account_type=="Tax"'},
 		{fieldtype:'Link', fieldname:'warehouse', label:__('Warehouse'), options:"Warehouse",
-			depends_on: 'eval:(!doc.is_group&&doc.account_type=="Warehouse")'},
+			depends_on: 'eval:(!doc.is_group&&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 +59,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
 }
--- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+++ b/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,6 +169,59 @@
   "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, 
@@ -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, 
--- a/erpnext/accounts/doctype/asset/asset.js
+++ b/erpnext/accounts/doctype/asset/asset.js
@@ -18,7 +18,8 @@ frappe.ui.form.on('Asset', {
 		frm.set_query("warehouse", function() {
 			return {
 				"filters": {
-					"company": frm.doc.company
+					"company": frm.doc.company,
+					"is_group": 0
 				}
 			};
 		});
@@ -232,7 +233,10 @@ erpnext.asset.transfer_asset = function(frm) {
 				"options": "Warehouse",
 				"get_query": function () {
 					return {
-						filters: [["Warehouse", "company", "in", ["", cstr(frm.doc.company)]]]
+						filters: [
+							["Warehouse", "company", "in", ["", cstr(frm.doc.company)]],
+							["Warehouse", "is_group", "=", 0]
+						]
 					}
 				}, 
 				"reqd": 1 
--- a/erpnext/accounts/doctype/asset/asset.py
+++ b/erpnext/accounts/doctype/asset/asset.py
@@ -80,7 +80,7 @@ class Asset(Document):
 				frappe.throw(_("Number of Depreciations Booked cannot be greater than Total Number of Depreciations"))
 						
 		if self.next_depreciation_date and getdate(self.next_depreciation_date) < getdate(nowdate()):
-			frappe.throw(_("Next Depreciation Date must be on or after today"))
+			frappe.msgprint(_("Next Depreciation Date is entered as past date"))
 			
 		if (flt(self.value_after_depreciation) > flt(self.expected_value_after_useful_life) 
 			and not self.next_depreciation_date):
--- a/erpnext/accounts/doctype/asset_category/asset_category.js
+++ b/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');
--- a/erpnext/accounts/doctype/asset_category_account/asset_category_account.json
+++ b/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, 
@@ -40,6 +41,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 3, 
   "fieldname": "fixed_asset_account", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -66,6 +68,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 2, 
   "fieldname": "accumulated_depreciation_account", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -92,6 +95,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 2, 
   "fieldname": "depreciation_expense_account", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -125,7 +129,7 @@
 "issingle": 0, 
 "istable": 1, 
 "max_attachments": 0, 
- "modified": "2016-07-11 03:27:58.048060", 
+ "modified": "2016-08-26 01:46:01.604335", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Asset Category Account", 
--- a/erpnext/accounts/doctype/asset_movement/asset_movement.js
+++ b/erpnext/accounts/doctype/asset_movement/asset_movement.js
@@ -7,7 +7,10 @@ frappe.ui.form.on('Asset Movement', {
 		
 		frm.set_query("target_warehouse", function() {
 			return {
-				filters: [["Warehouse", "company", "in", ["", cstr(frm.doc.company)]]]
+				filters: [
+					["Warehouse", "company", "in", ["", cstr(frm.doc.company)]],
+					["Warehouse", "is_group", "=", 0]
+				]
 			}
 		})

--- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js
+++ b/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) {
--- a/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json
+++ b/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,13 +40,14 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "payment_entry", 
   "fieldtype": "Dynamic Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
   "label": "Payment Entry", 
   "length": 0, 
   "no_copy": 0, 
@@ -67,6 +69,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 3, 
   "fieldname": "against_account", 
   "fieldtype": "Data", 
   "hidden": 0, 
@@ -94,6 +97,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 2, 
   "fieldname": "amount", 
   "fieldtype": "Currency", 
   "hidden": 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": 0, 
   "fieldname": "posting_date", 
   "fieldtype": "Date", 
   "hidden": 0, 
@@ -172,6 +178,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 3, 
   "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-08-26 01:51:36.123941", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Bank Reconciliation Detail", 
--- a/erpnext/accounts/doctype/budget/budget.py
+++ b/erpnext/accounts/doctype/budget/budget.py
@@ -51,6 +51,9 @@ class Budget(Document):

 def validate_expense_against_budget(args):
 	args = frappe._dict(args)
+	if not args.cost_center:
+		return
+		
 	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"])

--- a/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.py
+++ b/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.py
@@ -43,7 +43,7 @@ def create_or_update_cheque_print_format(template_name):
 		</span>
 		<span style="top:%(payer_name_from_top_edge)scm;left: %(payer_name_from_left_edge)scm;
 			position: absolute;">
-			{{doc.party}}
+			{{doc.party_name}}
 		</span>
 		<span style="top:%(amt_in_words_from_top_edge)scm; left:%(amt_in_words_from_left_edge)scm;
 			position: absolute; display: block; width: %(amt_in_word_width)scm;
--- a/erpnext/accounts/doctype/cost_center/cost_center.json
+++ b/erpnext/accounts/doctype/cost_center/cost_center.json
@@ -10,6 +10,7 @@
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Setup", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -249,14 +250,15 @@
 "hide_toolbar": 0, 
 "icon": "icon-money", 
 "idx": 1, 
- "in_create": 0, 
+ "image_view": 0, 
+ "in_create": 1, 
 "in_dialog": 0, 
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
 "menu_index": 0, 
- "modified": "2016-05-16 15:23:14.770933", 
+ "modified": "2016-10-18 14:22:00.207907", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Cost Center", 
@@ -368,6 +370,5 @@
 "read_only_onload": 0, 
 "search_fields": "parent_cost_center, is_group", 
 "sort_order": "ASC", 
- "track_seen": 0, 
- "version": 0
+ "track_seen": 0
 }
--- a/erpnext/accounts/doctype/cost_center/cost_center_tree.js
+++ b/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"]
 }
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.py
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.py
@@ -44,9 +44,12 @@ 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(_("Customer is required against Receivable account {0}").format(self.account))
+			elif account_type == "Payable":
+				frappe.throw(_("Supplier is required against Payable account {0}").format(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))
@@ -54,7 +57,7 @@ class GLEntry(Document):
 	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}")
+				frappe.throw(_("Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.")
 					.format(self.account))
 		else:
 			if self.cost_center:
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/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);
@@ -268,7 +259,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 +266,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",
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.json
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.json
@@ -3,16 +3,19 @@
 "allow_import": 1, 
 "allow_rename": 0, 
 "autoname": "naming_series:", 
+ "beta": 0, 
 "creation": "2013-03-25 10:53:52", 
 "custom": 0, 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Document", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "entry_type_and_date", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -38,6 +41,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "", 
   "fieldname": "title", 
   "fieldtype": "Data", 
@@ -64,6 +68,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "Journal Entry", 
   "fieldname": "voucher_type", 
   "fieldtype": "Select", 
@@ -92,6 +97,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "naming_series", 
   "fieldtype": "Select", 
   "hidden": 0, 
@@ -119,6 +125,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -144,6 +151,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "posting_date", 
   "fieldtype": "Date", 
   "hidden": 0, 
@@ -170,6 +178,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "company", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -197,6 +206,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "2_add_edit_gl_entries", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -223,6 +233,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "accounts", 
   "fieldtype": "Table", 
   "hidden": 0, 
@@ -250,6 +261,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "section_break99", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -273,6 +285,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "", 
   "fieldname": "cheque_no", 
   "fieldtype": "Data", 
@@ -300,6 +313,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "cheque_date", 
   "fieldtype": "Date", 
   "hidden": 0, 
@@ -326,6 +340,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "user_remark", 
   "fieldtype": "Small Text", 
   "hidden": 0, 
@@ -352,6 +367,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break99", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -375,6 +391,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "total_debit", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -402,6 +419,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "total_credit", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -429,6 +447,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "difference", 
   "fieldname": "difference", 
   "fieldtype": "Currency", 
@@ -457,6 +476,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "difference", 
   "fieldname": "get_balance", 
   "fieldtype": "Button", 
@@ -483,6 +503,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "multi_currency", 
   "fieldtype": "Check", 
   "hidden": 0, 
@@ -504,10 +525,38 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_amount_currency", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Total Amount Currency", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
  {
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "total_amount", 
   "fieldtype": "Currency", 
   "hidden": 1, 
@@ -518,7 +567,7 @@
   "label": "Total Amount", 
   "length": 0, 
   "no_copy": 1, 
-   "options": "Company:company:default_currency", 
+   "options": "total_amount_currency", 
   "permlevel": 0, 
   "print_hide": 0, 
   "print_hide_if_no_value": 0, 
@@ -533,6 +582,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "total_amount_in_words", 
   "fieldtype": "Data", 
   "hidden": 1, 
@@ -557,6 +607,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "reference", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -582,6 +633,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "clearance_date", 
   "fieldtype": "Date", 
   "hidden": 0, 
@@ -608,6 +660,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "", 
   "fieldname": "remark", 
   "fieldtype": "Small Text", 
@@ -635,6 +688,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break98", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -658,6 +712,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "bill_no", 
   "fieldtype": "Data", 
   "hidden": 0, 
@@ -684,6 +739,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "bill_date", 
   "fieldtype": "Date", 
   "hidden": 0, 
@@ -710,6 +766,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "due_date", 
   "fieldtype": "Date", 
   "hidden": 0, 
@@ -736,6 +793,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "depends_on": "eval:doc.voucher_type == 'Write Off Entry'", 
   "fieldname": "write_off", 
   "fieldtype": "Section Break", 
@@ -762,6 +820,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "Accounts Receivable", 
   "depends_on": "eval:doc.voucher_type == 'Write Off Entry'", 
   "fieldname": "write_off_based_on", 
@@ -789,6 +848,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.voucher_type == 'Write Off Entry'", 
   "fieldname": "get_outstanding_invoices", 
   "fieldtype": "Button", 
@@ -815,6 +875,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_30", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -839,6 +900,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.voucher_type == 'Write Off Entry'", 
   "fieldname": "write_off_amount", 
   "fieldtype": "Currency", 
@@ -865,6 +927,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "printing_settings", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -890,6 +953,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "pay_to_recd_from", 
   "fieldtype": "Data", 
   "hidden": 0, 
@@ -914,6 +978,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_35", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -938,6 +1003,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "letter_head", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -963,6 +1029,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "select_print_heading", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -990,6 +1057,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "addtional_info", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1016,6 +1084,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break3", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -1041,6 +1110,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "No", 
   "description": "", 
   "fieldname": "is_opening", 
@@ -1070,6 +1140,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:inList([\"Credit Note\", \"Debit Note\"], doc.voucher_type)", 
   "fieldname": "stock_entry", 
   "fieldtype": "Link", 
@@ -1097,6 +1168,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "amended_from", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -1125,6 +1197,7 @@
 "hide_toolbar": 0, 
 "icon": "icon-file-text", 
 "idx": 176, 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 1, 
@@ -1132,7 +1205,7 @@
 "istable": 0, 
 "max_attachments": 0, 
 "menu_index": 0, 
- "modified": "2016-04-06 05:33:21.851581", 
+ "modified": "2016-10-03 10:13:49.458343", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Journal Entry", 
@@ -1148,6 +1221,7 @@
   "export": 0, 
   "if_owner": 0, 
   "import": 0, 
+   "is_custom": 0, 
   "permlevel": 0, 
   "print": 1, 
   "read": 1, 
@@ -1168,6 +1242,7 @@
   "export": 0, 
   "if_owner": 0, 
   "import": 0, 
+   "is_custom": 0, 
   "permlevel": 0, 
   "print": 1, 
   "read": 1, 
@@ -1188,6 +1263,7 @@
   "export": 0, 
   "if_owner": 0, 
   "import": 0, 
+   "is_custom": 0, 
   "permlevel": 0, 
   "print": 1, 
   "read": 1, 
@@ -1199,6 +1275,7 @@
   "write": 0
  }
 ], 
+ "quick_entry": 0, 
 "read_only": 0, 
 "read_only_onload": 1, 
 "search_fields": "voucher_type,posting_date, due_date, cheque_no", 
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -62,11 +62,13 @@ class JournalEntry(AccountsController):

 	def on_cancel(self):
 		from erpnext.accounts.utils import unlink_ref_doc_from_payment_entries
+		from erpnext.hr.doctype.salary_slip.salary_slip import unlink_ref_doc_from_salary_slip
 		unlink_ref_doc_from_payment_entries(self.doctype, self.name)
-
+		unlink_ref_doc_from_salary_slip(self.name)		
 		self.make_gl_entries(1)
 		self.update_advance_paid()
 		self.update_expense_claim()
+		

 	def validate_party(self):
 		for d in self.get("accounts"):
@@ -381,6 +383,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)

--- a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
+++ b/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", 
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/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() {
@@ -226,6 +219,12 @@ frappe.ui.form.on('Payment Entry', {

 	party: function(frm) {
 		if(frm.doc.payment_type && frm.doc.party_type && frm.doc.party) {
+			if(!frm.doc.posting_date) {
+				frappe.msgprint(__("Please select Posting Date before selecting Party"))
+				frm.set_value("party", "");
+				return ;
+			}
+			
 			frm.set_party_account_based_on_party = true;

 			return frappe.call({
@@ -505,6 +504,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;
@@ -546,22 +557,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);
 	},
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.json
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.json
@@ -15,6 +15,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "type_of_payment", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -40,6 +41,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "naming_series", 
   "fieldtype": "Select", 
   "hidden": 0, 
@@ -66,13 +68,14 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "payment_type", 
   "fieldtype": "Select", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
-   "in_list_view": 0, 
+   "in_list_view": 1, 
   "label": "Payment Type", 
   "length": 0, 
   "no_copy": 0, 
@@ -92,6 +95,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:in_list([\"Receive\", \"Pay\"], doc.payment_type)", 
   "fieldname": "party_type", 
   "fieldtype": "Select", 
@@ -119,6 +123,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:in_list([\"Receive\", \"Pay\"], doc.payment_type) && doc.party_type", 
   "fieldname": "party", 
   "fieldtype": "Dynamic Link", 
@@ -146,6 +151,33 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "party_name", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Party Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "column_break_5", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -170,6 +202,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "Today", 
   "fieldname": "posting_date", 
   "fieldtype": "Date", 
@@ -196,6 +229,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "company", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -222,6 +256,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "mode_of_payment", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -248,6 +283,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "payment_accounts_section", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -273,6 +309,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "party", 
   "fieldname": "party_balance", 
   "fieldtype": "Currency", 
@@ -299,6 +336,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:(in_list([\"Internal Transfer\", \"Pay\"], doc.payment_type) || doc.party)", 
   "fieldname": "paid_from", 
   "fieldtype": "Link", 
@@ -326,6 +364,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "paid_from", 
   "fieldname": "paid_from_account_currency", 
   "fieldtype": "Link", 
@@ -353,6 +392,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "paid_from", 
   "fieldname": "paid_from_account_balance", 
   "fieldtype": "Currency", 
@@ -380,6 +420,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_18", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -404,6 +445,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:(in_list([\"Internal Transfer\", \"Receive\"], doc.payment_type) || doc.party)", 
   "fieldname": "paid_to", 
   "fieldtype": "Link", 
@@ -431,6 +473,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "paid_to", 
   "fieldname": "paid_to_account_currency", 
   "fieldtype": "Link", 
@@ -458,6 +501,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "paid_to", 
   "fieldname": "paid_to_account_balance", 
   "fieldtype": "Currency", 
@@ -486,6 +530,7 @@
   "bold": 0, 
   "collapsible": 0, 
   "collapsible_depends_on": "", 
+   "columns": 0, 
   "depends_on": "eval:(doc.paid_to && doc.paid_from)", 
   "fieldname": "payment_amounts_section", 
   "fieldtype": "Section Break", 
@@ -512,6 +557,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "", 
   "fieldname": "paid_amount", 
   "fieldtype": "Currency", 
@@ -539,6 +585,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "", 
   "fieldname": "source_exchange_rate", 
   "fieldtype": "Float", 
@@ -565,6 +612,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "", 
   "fieldname": "base_paid_amount", 
   "fieldtype": "Currency", 
@@ -592,6 +640,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_21", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -616,6 +665,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "", 
   "fieldname": "received_amount", 
   "fieldtype": "Currency", 
@@ -643,6 +693,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "", 
   "fieldname": "target_exchange_rate", 
   "fieldtype": "Float", 
@@ -669,6 +720,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "", 
   "fieldname": "base_received_amount", 
   "fieldtype": "Currency", 
@@ -697,6 +749,7 @@
   "bold": 0, 
   "collapsible": 1, 
   "collapsible_depends_on": "references", 
+   "columns": 0, 
   "depends_on": "eval:(doc.party && doc.paid_from && doc.paid_to && doc.paid_amount && doc.received_amount)", 
   "fieldname": "section_break_14", 
   "fieldtype": "Section Break", 
@@ -723,6 +776,35 @@
   "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, 
+   "label": "Allocate Payment Amount", 
+   "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, 
   "depends_on": "", 
   "fieldname": "references", 
   "fieldtype": "Table", 
@@ -750,6 +832,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "", 
   "fieldname": "section_break_34", 
   "fieldtype": "Section Break", 
@@ -776,6 +859,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:(doc.paid_amount && doc.received_amount && doc.references)", 
   "fieldname": "total_allocated_amount", 
   "fieldtype": "Currency", 
@@ -802,6 +886,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "", 
   "fieldname": "base_total_allocated_amount", 
   "fieldtype": "Currency", 
@@ -829,6 +914,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "set_exchange_gain_loss", 
   "fieldtype": "Button", 
   "hidden": 0, 
@@ -854,6 +940,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_36", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -878,6 +965,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:(doc.paid_amount && doc.received_amount && doc.references)", 
   "fieldname": "unallocated_amount", 
   "fieldtype": "Currency", 
@@ -904,6 +992,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:(doc.paid_amount && doc.received_amount)", 
   "fieldname": "difference_amount", 
   "fieldtype": "Currency", 
@@ -931,6 +1020,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "difference_amount", 
   "fieldname": "write_off_difference_amount", 
   "fieldtype": "Button", 
@@ -958,6 +1048,7 @@
   "bold": 0, 
   "collapsible": 1, 
   "collapsible_depends_on": "deductions", 
+   "columns": 0, 
   "depends_on": "eval:(doc.paid_amount && doc.received_amount)", 
   "fieldname": "deductions_or_loss_section", 
   "fieldtype": "Section Break", 
@@ -984,6 +1075,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "deductions", 
   "fieldtype": "Table", 
   "hidden": 0, 
@@ -1010,6 +1102,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "transaction_references", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1035,6 +1128,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:(doc.paid_from && doc.paid_to)", 
   "fieldname": "reference_no", 
   "fieldtype": "Data", 
@@ -1061,6 +1155,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_23", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -1085,6 +1180,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:(doc.paid_from && doc.paid_to)", 
   "fieldname": "reference_date", 
   "fieldtype": "Date", 
@@ -1111,6 +1207,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.docstatus==1", 
   "fieldname": "clearance_date", 
   "fieldtype": "Date", 
@@ -1138,6 +1235,7 @@
   "bold": 0, 
   "collapsible": 1, 
   "collapsible_depends_on": "", 
+   "columns": 0, 
   "depends_on": "eval:(doc.paid_from && doc.paid_to && doc.paid_amount && doc.received_amount)", 
   "fieldname": "section_break_12", 
   "fieldtype": "Section Break", 
@@ -1164,6 +1262,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "", 
   "fieldname": "project", 
   "fieldtype": "Link", 
@@ -1191,6 +1290,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "remarks", 
   "fieldtype": "Small Text", 
   "hidden": 0, 
@@ -1216,6 +1316,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_16", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -1240,6 +1341,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "letter_head", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -1266,6 +1368,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "print_heading", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -1292,6 +1395,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "amended_from", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -1317,6 +1421,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "title", 
   "fieldtype": "Data", 
   "hidden": 1, 
@@ -1349,8 +1454,8 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2016-07-11 08:06:33.121527", 
- "modified_by": "NuranVerkleij@example.com", 
+ "modified": "2016-09-28 18:20:47.625383", 
+ "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Payment Entry", 
 "name_case": "", 
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -73,6 +73,9 @@ class PaymentEntry(AccountsController):
 				
 			if not self.party:
 				frappe.throw(_("Party is mandatory"))
+				
+			self.party_name = frappe.db.get_value(self.party_type, self.party, 
+				self.party_type.lower() + "_name")
 		
 		if self.party:
 			if not self.party_balance:
@@ -666,6 +669,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,
--- a/erpnext/accounts/doctype/payment_entry/payment_entry_list.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry_list.js
@@ -1,6 +0,0 @@
-frappe.listview_settings['Payment Entry'] = {
-	add_fields: ["payment_type"],
-	get_indicator: function(doc) {
-		return [__(doc.payment_type), (doc.docstatus==0 ? 'red' : 'blue'), 'status=' + doc.payment_type]
-	}
-}
--- a/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
+++ b/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, 
@@ -40,6 +41,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 2, 
   "fieldname": "reference_name", 
   "fieldtype": "Dynamic Link", 
   "hidden": 0, 
@@ -66,6 +68,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "due_date", 
   "fieldtype": "Date", 
   "hidden": 0, 
@@ -91,6 +94,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_4", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -115,6 +119,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "total_amount", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -140,6 +145,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 3, 
   "fieldname": "outstanding_amount", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -165,13 +171,14 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 3, 
   "fieldname": "allocated_amount", 
   "fieldtype": "Float", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
-   "in_list_view": 0, 
+   "in_list_view": 1, 
   "label": "Allocated", 
   "length": 0, 
   "no_copy": 0, 
@@ -190,6 +197,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "exchange_rate", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -222,7 +230,7 @@
 "issingle": 0, 
 "istable": 1, 
 "max_attachments": 0, 
- "modified": "2016-07-14 14:48:13.356944", 
+ "modified": "2016-08-26 01:59:04.697274", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Payment Entry Reference", 
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
+++ b/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() {
--- a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
+++ b/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", 
--- a/erpnext/accounts/doctype/payment_request/payment_request.json
+++ b/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, 
@@ -15,6 +15,34 @@
   "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, 
+   "label": "Series", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "PR", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "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, 
+   "columns": 0, 
   "fieldname": "recipient_and_message", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -40,6 +68,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "", 
   "fieldname": "print_format", 
   "fieldtype": "Select", 
@@ -67,6 +96,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "email_to", 
   "fieldtype": "Data", 
   "hidden": 0, 
@@ -92,6 +122,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "subject", 
   "fieldtype": "Data", 
   "hidden": 0, 
@@ -117,6 +148,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_9", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -141,6 +173,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "payment_gateway_account", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -167,6 +200,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "currency", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -193,6 +227,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "Amount in customer's currency", 
   "fieldname": "grand_total", 
   "fieldtype": "Currency", 
@@ -220,6 +255,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "Draft", 
   "fieldname": "status", 
   "fieldtype": "Select", 
@@ -247,6 +283,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", 
@@ -273,6 +310,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "section_break_10", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -297,6 +335,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "message", 
   "fieldtype": "Small Text", 
   "hidden": 0, 
@@ -322,6 +361,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "message_examples", 
   "fieldtype": "HTML", 
   "hidden": 0, 
@@ -348,6 +388,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "mute_email", 
   "fieldtype": "Check", 
   "hidden": 1, 
@@ -373,6 +414,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "payment_url", 
   "fieldtype": "Data", 
   "hidden": 1, 
@@ -399,6 +441,7 @@
   "bold": 0, 
   "collapsible": 1, 
   "collapsible_depends_on": "doc.payment_gateway_account", 
+   "columns": 0, 
   "fieldname": "section_break_7", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -424,6 +467,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "payment_gateway", 
   "fieldtype": "Read Only", 
   "hidden": 0, 
@@ -450,6 +494,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "payment_account", 
   "fieldtype": "Read Only", 
   "hidden": 0, 
@@ -476,6 +521,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "reference_details", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -501,6 +547,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "reference_doctype", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -527,6 +574,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "reference_name", 
   "fieldtype": "Dynamic Link", 
   "hidden": 0, 
@@ -553,6 +601,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "amended_from", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -585,7 +634,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2016-07-25 01:34:44.372161", 
+ "modified": "2016-09-02 04:07:15.279949", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Payment Request", 
--- a/erpnext/accounts/doctype/payment_request/payment_request.py
+++ b/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 """
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -165,6 +165,13 @@ def get_pricing_rule_for_item(args):
 			})
 		else:
 			item_details.discount_percentage = pricing_rule.discount_percentage
+	elif args.get('pricing_rule'):
+		if frappe.db.get_value('Pricing Rule', args.get('pricing_rule'), 'price_or_discount') == 'Discount Percentage':
+			item_details.discount_percentage = 0.0
+
+		item_details.margin_rate_or_amount = 0.0
+		item_details.margin_type = None
+
 	return item_details

 def get_pricing_rules(args):
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -340,14 +340,20 @@ frappe.ui.form.on("Purchase Invoice", {
 		$.each(["warehouse", "rejected_warehouse"], function(i, field) {
 			frm.set_query(field, "items", function() {
 				return {
-					filters: [["Warehouse", "company", "in", ["", cstr(frm.doc.company)]]]
+					filters: [
+						["Warehouse", "company", "in", ["", cstr(frm.doc.company)]],
+						["Warehouse", "is_group", "=", 0]
+					]
 				}
 			})
 		})

 		frm.set_query("supplier_warehouse", function() {
 			return {
-				filters: [["Warehouse", "company", "in", ["", cstr(frm.doc.company)]]]
+				filters: [
+					["Warehouse", "company", "in", ["", cstr(frm.doc.company)]],
+					["Warehouse", "is_group", "=", 0]
+				]
 			}
 		})
 	},
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -15,6 +15,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "{supplier_name}", 
   "fieldname": "title", 
   "fieldtype": "Data", 
@@ -41,6 +42,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "naming_series", 
   "fieldtype": "Select", 
   "hidden": 0, 
@@ -68,6 +70,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "supplier", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -95,6 +98,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "supplier", 
   "fieldname": "supplier_name", 
   "fieldtype": "Data", 
@@ -122,6 +126,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "", 
   "fieldname": "bill_no", 
   "fieldtype": "Data", 
@@ -149,6 +154,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "is_paid", 
   "fieldtype": "Check", 
   "hidden": 0, 
@@ -174,6 +180,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "0", 
   "fieldname": "is_return", 
   "fieldtype": "Check", 
@@ -184,7 +191,7 @@
   "in_list_view": 0, 
   "label": "Is Return", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 1, 
@@ -200,6 +207,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -225,6 +233,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "Today", 
   "fieldname": "posting_date", 
   "fieldtype": "Date", 
@@ -252,6 +261,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "due_date", 
   "fieldtype": "Date", 
   "hidden": 0, 
@@ -278,6 +288,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "bill_date", 
   "fieldtype": "Date", 
   "hidden": 0, 
@@ -304,6 +315,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "amended_from", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -331,6 +343,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "company", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -356,6 +369,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "is_return", 
   "fieldname": "return_against", 
   "fieldtype": "Link", 
@@ -366,7 +380,7 @@
   "in_list_view": 0, 
   "label": "Return Against Purchase Invoice", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "options": "Purchase Invoice", 
   "permlevel": 0, 
   "precision": "", 
@@ -383,6 +397,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "section_addresses", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -408,6 +423,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "supplier_address", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -433,6 +449,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "contact_person", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -458,6 +475,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "", 
   "fieldname": "address_display", 
   "fieldtype": "Small Text", 
@@ -483,6 +501,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "contact_display", 
   "fieldtype": "Small Text", 
   "hidden": 0, 
@@ -507,6 +526,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "contact_mobile", 
   "fieldtype": "Small Text", 
   "hidden": 0, 
@@ -531,6 +551,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "contact_email", 
   "fieldtype": "Small Text", 
   "hidden": 0, 
@@ -555,6 +576,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "col_break_address", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -579,6 +601,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "", 
   "fieldname": "shipping_address", 
   "fieldtype": "Link", 
@@ -606,6 +629,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "shipping_address_display", 
   "fieldtype": "Small Text", 
   "hidden": 0, 
@@ -631,6 +655,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "currency_and_price_list", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -656,6 +681,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "currency", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -683,6 +709,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "", 
   "fieldname": "conversion_rate", 
   "fieldtype": "Float", 
@@ -711,6 +738,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break2", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -734,6 +762,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "buying_price_list", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -759,6 +788,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "price_list_currency", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -784,6 +814,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "plc_conversion_rate", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -809,6 +840,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "ignore_pricing_rule", 
   "fieldtype": "Check", 
   "hidden": 0, 
@@ -833,6 +865,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "items_section", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -859,6 +892,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "0", 
   "fieldname": "update_stock", 
   "fieldtype": "Check", 
@@ -885,6 +919,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "items", 
   "fieldtype": "Table", 
   "hidden": 0, 
@@ -912,6 +947,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "section_break_26", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -935,6 +971,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_total", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -961,6 +998,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "", 
   "fieldname": "base_net_total", 
   "fieldtype": "Currency", 
@@ -989,6 +1027,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_28", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -1012,6 +1051,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "total", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1038,6 +1078,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "net_total", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1065,6 +1106,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "taxes_section", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1091,6 +1133,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "taxes_and_charges", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -1118,6 +1161,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "taxes", 
   "fieldtype": "Table", 
   "hidden": 0, 
@@ -1145,6 +1189,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "other_charges_calculation", 
   "fieldtype": "HTML", 
   "hidden": 0, 
@@ -1170,6 +1215,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "totals", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1196,6 +1242,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_taxes_and_charges_added", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1223,6 +1270,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_taxes_and_charges_deducted", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1250,6 +1298,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_total_taxes_and_charges", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1277,6 +1326,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_40", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -1301,6 +1351,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "taxes_and_charges_added", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1328,6 +1379,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "taxes_and_charges_deducted", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1355,6 +1407,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "total_taxes_and_charges", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1382,6 +1435,7 @@
   "bold": 0, 
   "collapsible": 1, 
   "collapsible_depends_on": "discount_amount", 
+   "columns": 0, 
   "fieldname": "section_break_44", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1407,6 +1461,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "Grand Total", 
   "fieldname": "apply_discount_on", 
   "fieldtype": "Select", 
@@ -1434,6 +1489,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_discount_amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1460,6 +1516,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_46", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -1484,6 +1541,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "additional_discount_percentage", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -1509,6 +1567,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "discount_amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1535,6 +1594,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "section_break_49", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1559,6 +1619,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_grand_total", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1586,6 +1647,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "", 
   "fieldname": "base_in_words", 
   "fieldtype": "Data", 
@@ -1613,6 +1675,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break8", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -1638,6 +1701,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "grand_total", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1665,6 +1729,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "in_words", 
   "fieldtype": "Data", 
   "hidden": 0, 
@@ -1691,6 +1756,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "total_advance", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1718,6 +1784,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "outstanding_amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1746,6 +1813,7 @@
   "bold": 0, 
   "collapsible": 1, 
   "collapsible_depends_on": "paid_amount", 
+   "columns": 0, 
   "depends_on": "eval:doc.is_paid===1||(doc.advances && doc.advances.length>0)", 
   "fieldname": "payments_section", 
   "fieldtype": "Section Break", 
@@ -1772,6 +1840,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "mode_of_payment", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -1798,6 +1867,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "cash_bank_account", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -1824,6 +1894,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "col_br_payments", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -1848,6 +1919,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "is_paid", 
   "fieldname": "paid_amount", 
   "fieldtype": "Currency", 
@@ -1875,6 +1947,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_paid_amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1902,6 +1975,7 @@
   "bold": 0, 
   "collapsible": 1, 
   "collapsible_depends_on": "write_off_amount", 
+   "columns": 0, 
   "depends_on": "grand_total", 
   "fieldname": "write_off", 
   "fieldtype": "Section Break", 
@@ -1928,6 +2002,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "write_off_amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1953,6 +2028,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_write_off_amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1979,6 +2055,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_61", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -2003,6 +2080,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:flt(doc.write_off_amount)!=0", 
   "fieldname": "write_off_account", 
   "fieldtype": "Link", 
@@ -2029,6 +2107,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:flt(doc.write_off_amount)!=0", 
   "fieldname": "write_off_cost_center", 
   "fieldtype": "Link", 
@@ -2056,6 +2135,7 @@
   "bold": 0, 
   "collapsible": 1, 
   "collapsible_depends_on": "advances", 
+   "columns": 0, 
   "fieldname": "advances_section", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -2082,6 +2162,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "get_advances", 
   "fieldtype": "Button", 
   "hidden": 0, 
@@ -2108,6 +2189,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "advances", 
   "fieldtype": "Table", 
   "hidden": 0, 
@@ -2136,6 +2218,7 @@
   "bold": 0, 
   "collapsible": 1, 
   "collapsible_depends_on": "terms", 
+   "columns": 0, 
   "fieldname": "terms_section_break", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -2161,6 +2244,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "tc_name", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -2186,6 +2270,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "terms", 
   "fieldtype": "Text Editor", 
   "hidden": 0, 
@@ -2210,6 +2295,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "raw_materials_supplied", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -2235,6 +2321,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "No", 
   "fieldname": "is_subcontracted", 
   "fieldtype": "Select", 
@@ -2262,6 +2349,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "supplier_warehouse", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -2290,6 +2378,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "supplied_items", 
   "fieldtype": "Table", 
   "hidden": 0, 
@@ -2316,6 +2405,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "printing_settings", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -2341,6 +2431,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "letter_head", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -2367,6 +2458,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "select_print_heading", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -2394,6 +2486,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "language", 
   "fieldtype": "Data", 
   "hidden": 0, 
@@ -2419,6 +2512,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "more_info", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -2445,6 +2539,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "", 
   "fieldname": "credit_to", 
   "fieldtype": "Link", 
@@ -2473,6 +2568,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "party_account_currency", 
   "fieldtype": "Link", 
   "hidden": 1, 
@@ -2499,6 +2595,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "No", 
   "description": "", 
   "fieldname": "is_opening", 
@@ -2528,6 +2625,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "against_expense_account", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
@@ -2554,6 +2652,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_63", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -2577,6 +2676,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "posting_time", 
   "fieldtype": "Time", 
   "hidden": 0, 
@@ -2604,6 +2704,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "remarks", 
   "fieldtype": "Small Text", 
   "hidden": 0, 
@@ -2630,6 +2731,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "Warehouse where you are maintaining stock of rejected items", 
   "fieldname": "rejected_warehouse", 
   "fieldtype": "Link", 
@@ -2658,6 +2760,7 @@
   "bold": 0, 
   "collapsible": 1, 
   "collapsible_depends_on": "is_recurring", 
+   "columns": 0, 
   "depends_on": "eval:doc.docstatus<2", 
   "fieldname": "recurring_invoice", 
   "fieldtype": "Section Break", 
@@ -2684,6 +2787,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.docstatus<2", 
   "description": "", 
   "fieldname": "is_recurring", 
@@ -2710,6 +2814,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.is_recurring==1", 
   "description": "Select the period when the invoice will be generated automatically", 
   "fieldname": "recurring_type", 
@@ -2737,6 +2842,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.is_recurring==1", 
   "description": "Start date of current invoice's period", 
   "fieldname": "from_date", 
@@ -2763,6 +2869,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.is_recurring==1", 
   "description": "End date of current invoice's period", 
   "fieldname": "to_date", 
@@ -2789,6 +2896,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
   "fieldname": "submit_on_creation", 
   "fieldtype": "Check", 
@@ -2815,6 +2923,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
   "description": "", 
   "fieldname": "notify_by_email", 
@@ -2842,6 +2951,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.is_recurring==1", 
   "description": "The day of the month on which auto invoice will be generated e.g. 05, 28 etc", 
   "fieldname": "repeat_on_day_of_month", 
@@ -2868,6 +2978,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.is_recurring==1", 
   "description": "The date on which recurring invoice will be stop", 
   "fieldname": "end_date", 
@@ -2894,6 +3005,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_82", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -2918,6 +3030,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.is_recurring==1", 
   "description": "The date on which next invoice will be generated. It is generated on submit.", 
   "fieldname": "next_date", 
@@ -2944,6 +3057,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.is_recurring==1", 
   "description": "The unique id for tracking all recurring invoices. It is generated on submit.", 
   "fieldname": "recurring_id", 
@@ -2970,6 +3084,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.is_recurring==1", 
   "description": "Enter email id separated by commas, invoice will be mailed automatically on particular date", 
   "fieldname": "notification_email_address", 
@@ -2996,6 +3111,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.is_recurring==1", 
   "fieldname": "recurring_print_format", 
   "fieldtype": "Link", 
@@ -3032,7 +3148,7 @@
 "istable": 0, 
 "max_attachments": 0, 
 "menu_index": 0, 
- "modified": "2016-08-24 12:50:15.777689", 
+ "modified": "2016-09-23 18:02:45.349273", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Purchase Invoice", 
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -58,7 +58,7 @@ 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")
@@ -71,7 +71,7 @@ class PurchaseInvoice(BuyingController):
 			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 +155,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 +181,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):
@@ -302,25 +302,11 @@ class PurchaseInvoice(BuyingController):
 				asset.save()

 	def make_gl_entries(self, repost_future_gle=True):
-		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)
-
+		if not self.grand_total:
+			return
+		
+		gl_entries = self.get_gl_entries()
+		
 		if gl_entries:
 			update_outstanding = "No" if (cint(self.is_paid) or self.write_off_account) else "Yes"

@@ -339,6 +325,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:
@@ -369,7 +375,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
@@ -575,7 +581,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.doctype, self.name)

 			self.update_prevdoc_status()
 			self.update_billing_status_for_zero_amount_refdoc("Purchase Order")
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py
@@ -1,31 +1,32 @@
 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': {
+			'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'
 		},
-		{
-			'label': _('Reference'),
-			'items': ['Purchase Order', 'Purchase Receipt', 'Asset', 'Landed Cost Voucher']
+		'internal_links': {
+			'Purchase Order': ['items', 'sales_order'],
+			'Purchase Receipt': ['items', 'delivery_note'],
 		},
-		{
-			'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']
+			},
+		]
+	}
--- a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
+++ b/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)
@@ -411,6 +438,11 @@ 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 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")
 	args = frappe._dict(args)
@@ -455,4 +487,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')
--- a/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
+++ b/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", 
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
@@ -15,6 +15,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 3, 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -42,6 +43,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "col_break1", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -65,13 +67,14 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "item_name", 
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
   "label": "Item Name", 
   "length": 0, 
   "no_copy": 0, 
@@ -91,6 +94,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "description_section", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -116,6 +120,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "description", 
   "fieldtype": "Text Editor", 
   "hidden": 0, 
@@ -144,6 +149,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "image", 
   "fieldtype": "Attach", 
   "hidden": 1, 
@@ -169,6 +175,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "image_view", 
   "fieldtype": "Image", 
   "hidden": 0, 
@@ -195,6 +202,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "quantity_and_rate", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -219,6 +227,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "received_qty", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -244,6 +253,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 2, 
   "fieldname": "qty", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -270,6 +280,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "rejected_qty", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -295,6 +306,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "col_break2", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -318,13 +330,14 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "uom", 
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
   "label": "UOM", 
   "length": 0, 
   "no_copy": 0, 
@@ -343,6 +356,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "conversion_factor", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -367,6 +381,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "sec_break1", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -390,6 +405,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "price_list_rate", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -415,6 +431,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "price_list_rate", 
   "fieldname": "discount_percentage", 
   "fieldtype": "Percent", 
@@ -422,7 +439,7 @@
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
   "label": "Discount on Price List Rate (%)", 
   "length": 0, 
   "no_copy": 0, 
@@ -440,6 +457,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "col_break3", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -463,6 +481,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_price_list_rate", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -488,6 +507,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "sec_break2", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -511,6 +531,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 3, 
   "fieldname": "rate", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -538,6 +559,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 2, 
   "fieldname": "amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -565,6 +587,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "col_break4", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -588,6 +611,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_rate", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -615,6 +639,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -642,6 +667,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "pricing_rule", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -667,6 +693,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "section_break_22", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -691,6 +718,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "net_rate", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -717,6 +745,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "net_amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -743,6 +772,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_25", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -767,6 +797,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_net_rate", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -793,6 +824,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_net_amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -819,6 +851,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "warehouse_section", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -844,6 +877,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "", 
   "fieldname": "warehouse", 
   "fieldtype": "Link", 
@@ -871,6 +905,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "rejected_warehouse", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -897,6 +932,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "batch_no", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -923,6 +959,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "col_br_wh", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -948,6 +985,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "serial_no", 
   "fieldtype": "Text", 
   "hidden": 0, 
@@ -973,6 +1011,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "rejected_serial_no", 
   "fieldtype": "Text", 
   "hidden": 0, 
@@ -998,6 +1037,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "accounting", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1022,6 +1062,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "expense_account", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -1051,6 +1092,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "col_break5", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -1074,6 +1116,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "project", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -1099,6 +1142,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": ":Company", 
   "depends_on": "eval:!doc.is_fixed_asset", 
   "fieldname": "cost_center", 
@@ -1130,6 +1174,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "reference", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1154,6 +1199,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "brand", 
   "fieldtype": "Data", 
   "hidden": 1, 
@@ -1180,6 +1226,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "", 
   "fieldname": "item_group", 
   "fieldtype": "Link", 
@@ -1208,6 +1255,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges", 
   "fieldname": "item_tax_rate", 
   "fieldtype": "Code", 
@@ -1235,6 +1283,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "item_tax_amount", 
   "fieldtype": "Currency", 
   "hidden": 1, 
@@ -1262,6 +1311,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "purchase_order", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -1289,6 +1339,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "bom", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -1315,6 +1366,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "col_break6", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -1338,6 +1390,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "is_fixed_asset", 
   "fieldtype": "Check", 
   "hidden": 1, 
@@ -1363,6 +1416,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "is_fixed_asset", 
   "fieldname": "asset", 
   "fieldtype": "Link", 
@@ -1390,6 +1444,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "po_detail", 
   "fieldtype": "Data", 
   "hidden": 1, 
@@ -1416,6 +1471,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "purchase_receipt", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -1443,6 +1499,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "page_break", 
   "fieldtype": "Check", 
   "hidden": 0, 
@@ -1467,6 +1524,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "pr_detail", 
   "fieldtype": "Data", 
   "hidden": 1, 
@@ -1493,6 +1551,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "valuation_rate", 
   "fieldtype": "Currency", 
   "hidden": 1, 
@@ -1518,6 +1577,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "rm_supp_cost", 
   "fieldtype": "Currency", 
   "hidden": 1, 
@@ -1543,6 +1603,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "landed_cost_voucher_amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1575,7 +1636,7 @@
 "issingle": 0, 
 "istable": 1, 
 "max_attachments": 0, 
- "modified": "2016-07-11 03:28:04.932212", 
+ "modified": "2016-08-26 04:37:23.737537", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Purchase Invoice Item", 
--- a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
+++ b/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", 
--- a/erpnext/accounts/doctype/salary_component_account/init.py
+++ b/erpnext/accounts/doctype/salary_component_account/init.py
--- a/erpnext/accounts/doctype/salary_component_account/salary_component_account.json
+++ b/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
+}
--- a/erpnext/accounts/doctype/salary_component_account/salary_component_account.py
+++ b/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
--- a/erpnext/accounts/doctype/sales_invoice/pos.py
+++ b/erpnext/accounts/doctype/sales_invoice/pos.py
@@ -15,13 +15,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)
@@ -66,7 +64,7 @@ def update_pos_profile_data(doc, pos_profile, company_data):
 	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')

@@ -238,10 +236,4 @@ 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)
+		frappe.log_error(frappe.get_traceback())
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -462,25 +462,41 @@ 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];
+		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);
+				}
+			}
+		})
+	}
+})
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -191,7 +191,7 @@
   "in_list_view": 0, 
   "label": "Is Return", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 1, 
@@ -337,6 +337,34 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "project", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Project", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "project_name", 
+   "oldfieldtype": "Link", 
+   "options": "Project", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
  {
   "allow_on_submit": 0, 
   "bold": 0, 
@@ -380,7 +408,7 @@
   "in_list_view": 0, 
   "label": "Return Against Sales Invoice", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "options": "Sales Invoice", 
   "permlevel": 0, 
   "precision": "", 
@@ -2878,21 +2906,22 @@
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
-   "fieldname": "project", 
+   "depends_on": "", 
+   "fieldname": "campaign", 
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Project", 
+   "label": "Campaign", 
   "length": 0, 
   "no_copy": 0, 
-   "oldfieldname": "project_name", 
+   "oldfieldname": "campaign", 
   "oldfieldtype": "Link", 
-   "options": "Project", 
+   "options": "Campaign", 
   "permlevel": 0, 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
@@ -2926,42 +2955,13 @@
   "unique": 0, 
   "width": "50%"
  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.source == 'Campaign'", 
-   "fieldname": "campaign", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Campaign", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "campaign", 
-   "oldfieldtype": "Link", 
-   "options": "Campaign", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "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": "source", 
-   "fieldtype": "Select", 
+   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
@@ -2972,7 +2972,7 @@
   "no_copy": 0, 
   "oldfieldname": "source", 
   "oldfieldtype": "Select", 
-   "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign", 
+   "options": "Lead Source", 
   "permlevel": 0, 
   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
@@ -3867,7 +3867,7 @@
 "istable": 0, 
 "max_attachments": 0, 
 "menu_index": 0, 
- "modified": "2016-08-31 15:47:32.064861", 
+ "modified": "2016-09-24 15:54:33.104276", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Sales Invoice", 
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/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,8 @@ 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()

 	def before_save(self):
 		set_account_for_mode_of_payment(self)
@@ -134,7 +136,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.doctype, self.name)

 		if self.is_return:
 			# NOTE status updating bypassed for is_return
@@ -220,11 +223,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 +363,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)


@@ -390,7 +402,7 @@ class SalesInvoice(SellingController):
 		super(SalesInvoice, self).validate_warehouse()

 		for d in self.get('items'):
-			if not d.warehouse:
+			if not d.warehouse and frappe.db.get_value("Item", d.item_code, "is_stock_item"):
 				frappe.throw(_("Warehouse required at Row No {0}").format(d.idx))

 	def validate_delivery_note(self):
@@ -447,7 +459,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:
@@ -491,6 +531,8 @@ class SalesInvoice(SellingController):
 				throw(_("Delivery Note {0} is not submitted").format(d.delivery_note))

 	def make_gl_entries(self, repost_future_gle=True):
+		if not self.grand_total:
+			return
 		gl_entries = self.get_gl_entries()

 		if gl_entries:
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py
+++ b/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']
+			},
+		]
+	}
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -4,8 +4,9 @@ from __future__ import unicode_literals

 import frappe
 import unittest, copy
-from frappe.utils import nowdate, add_days, flt
+from frappe.utils import nowdate, add_days, flt, nowdate
 from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry, get_qty_after_transaction
+from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import unlink_payment_on_cancel_of_invoice
 from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory
 from erpnext.exceptions import InvalidAccountCurrency, InvalidCurrency
 from erpnext.stock.doctype.serial_no.serial_no import SerialNoWarehouseError
@@ -19,6 +20,12 @@ class TestSalesInvoice(unittest.TestCase):
 		w.submit()
 		return w

+	def setUp(self):
+		unlink_payment_on_cancel_of_invoice()
+
+	def tearDown(self):
+		unlink_payment_on_cancel_of_invoice(0)
+
 	def test_timestamp_change(self):
 		w = frappe.copy_doc(test_records[0])
 		w.docstatus = 0
@@ -78,6 +85,28 @@ class TestSalesInvoice(unittest.TestCase):
 		self.assertEquals(si.base_grand_total, 1627.05)
 		self.assertEquals(si.grand_total, 1627.05)

+	def test_payment_entry_unlink_against_invoice(self):
+		from erpnext.accounts.doctype.payment_entry.test_payment_entry import get_payment_entry
+		si = frappe.copy_doc(test_records[0])
+		si.is_pos = 0
+		si.insert()
+		si.submit()
+
+		pe = get_payment_entry("Sales Invoice", si.name, bank_account="_Test Bank - _TC")
+		pe.reference_no = "1"
+		pe.reference_date = nowdate()
+		pe.paid_from_account_currency = si.currency
+		pe.paid_to_account_currency = si.currency
+		pe.source_exchange_rate = 1
+		pe.target_exchange_rate = 1
+		pe.paid_amount = si.grand_total
+		pe.insert()
+		pe.submit()
+
+		unlink_payment_on_cancel_of_invoice(0)
+		si = frappe.get_doc('Sales Invoice', si.name)
+		self.assertRaises(frappe.LinkExistsError, si.cancel)
+
 	def test_sales_invoice_calculation_export_currency(self):
 		si = frappe.copy_doc(test_records[2])
 		si.currency = "USD"
@@ -562,61 +591,7 @@ class TestSalesInvoice(unittest.TestCase):

 		if not frappe.db.exists("POS Profile", "_Test POS Profile"):
 			pos_profile.insert()
-
-	def test_si_gl_entry_with_perpetual_inventory_and_update_stock_with_warehouse_but_no_account(self):
-		set_perpetual_inventory()
-		frappe.delete_doc("Account", "_Test Warehouse No Account - _TC")
-
-		# insert purchase receipt
-		from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import test_records \
-			as pr_test_records
-		pr = frappe.copy_doc(pr_test_records[0])
-		pr.naming_series = "_T-Purchase Receipt-"
-		pr.get("items")[0].warehouse = "_Test Warehouse No Account - _TC"
-		pr.insert()
-		pr.submit()
-
-		si_doc = copy.deepcopy(test_records[1])
-		si_doc["update_stock"] = 1
-		# si_doc["posting_time"] = "12:05"
-		si_doc.get("items")[0]["warehouse"] = "_Test Warehouse No Account - _TC"
-
-		si = frappe.copy_doc(si_doc)
-		si.insert()
-		si.submit()
-
-		# check stock ledger entries
-		sle = frappe.db.sql("""select * from `tabStock Ledger Entry`
-			where voucher_type = 'Sales Invoice' and voucher_no = %s""",
-			si.name, as_dict=1)[0]
-		self.assertTrue(sle)
-		self.assertEquals([sle.item_code, sle.warehouse, sle.actual_qty],
-			["_Test Item", "_Test Warehouse No Account - _TC", -1.0])
-
-		# check gl entries
-		gl_entries = frappe.db.sql("""select account, debit, credit
-			from `tabGL Entry` where voucher_type='Sales Invoice' and voucher_no=%s
-			order by account asc, debit asc""", si.name, as_dict=1)
-		self.assertTrue(gl_entries)
-
-		expected_gl_entries = dict((d[0], d) for d in [
-			[si.debit_to, 630.0, 0.0],
-			[si_doc.get("items")[0]["income_account"], 0.0, 500.0],
-			[si_doc.get("taxes")[0]["account_head"], 0.0, 80.0],
-			[si_doc.get("taxes")[1]["account_head"], 0.0, 50.0],
-		])
-		for i, gle in enumerate(gl_entries):
-			self.assertEquals(expected_gl_entries[gle.account][0], gle.account)
-			self.assertEquals(expected_gl_entries[gle.account][1], gle.debit)
-			self.assertEquals(expected_gl_entries[gle.account][2], gle.credit)
-
-		si.cancel()
-		gle = frappe.db.sql("""select * from `tabGL Entry`
-			where voucher_type='Sales Invoice' and voucher_no=%s""", si.name)
-
-		self.assertFalse(gle)
-		set_perpetual_inventory(0)
-
+			
 	def test_sales_invoice_gl_entry_with_perpetual_inventory_no_item_code(self):
 		set_perpetual_inventory()

--- a/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
+++ b/erpnext/accounts/doctype/sales_invoice_advance/sales_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:21.819598", 
+ "modified": "2016-08-26 02:36:10.718057", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Sales Invoice Advance", 
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -15,6 +15,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "barcode", 
   "fieldtype": "Data", 
   "hidden": 0, 
@@ -39,6 +40,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 4, 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -66,6 +68,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "col_break1", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -89,13 +92,14 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "item_name", 
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
   "label": "Item Name", 
   "length": 0, 
   "no_copy": 0, 
@@ -115,6 +119,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "customer_item_code", 
   "fieldtype": "Data", 
   "hidden": 1, 
@@ -139,6 +144,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "section_break_6", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -164,6 +170,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "description", 
   "fieldtype": "Text Editor", 
   "hidden": 0, 
@@ -192,6 +199,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_8", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -216,6 +224,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "image_view", 
   "fieldtype": "Image", 
   "hidden": 0, 
@@ -242,6 +251,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "image", 
   "fieldtype": "Attach", 
   "hidden": 1, 
@@ -267,6 +277,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "quantity_and_rate", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -291,6 +302,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 2, 
   "fieldname": "qty", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -317,6 +329,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "price_list_rate", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -344,6 +357,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "col_break2", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -367,13 +381,14 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "stock_uom", 
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
   "label": "UOM", 
   "length": 0, 
   "no_copy": 0, 
@@ -392,6 +407,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_price_list_rate", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -419,6 +435,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "discount_and_margin", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -444,6 +461,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "price_list_rate", 
   "fieldname": "discount_percentage", 
   "fieldtype": "Percent", 
@@ -451,7 +469,7 @@
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
   "label": "Discount on Price List Rate (%)", 
   "length": 0, 
   "no_copy": 0, 
@@ -471,6 +489,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_19", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -495,6 +514,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "price_list_rate", 
   "fieldname": "margin_type", 
   "fieldtype": "Select", 
@@ -522,6 +542,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.margin_type && doc.price_list_rate", 
   "fieldname": "margin_rate_or_amount", 
   "fieldtype": "Float", 
@@ -548,6 +569,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.margin_type && doc.price_list_rate", 
   "fieldname": "total_margin", 
   "fieldtype": "Float", 
@@ -574,6 +596,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "section_break1", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -597,6 +620,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 2, 
   "fieldname": "rate", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -624,6 +648,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 2, 
   "fieldname": "amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -651,6 +676,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "col_break3", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -674,6 +700,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_rate", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -701,6 +728,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -728,6 +756,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "pricing_rule", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -753,6 +782,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "section_break_21", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -777,6 +807,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "net_rate", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -803,6 +834,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "net_amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -829,6 +861,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_24", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -853,6 +886,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_net_rate", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -879,6 +913,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_net_amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -906,6 +941,7 @@
   "bold": 0, 
   "collapsible": 1, 
   "collapsible_depends_on": "eval:doc.delivered_by_supplier==1", 
+   "columns": 0, 
   "fieldname": "drop_ship", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -931,6 +967,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "delivered_by_supplier", 
   "fieldtype": "Check", 
   "hidden": 0, 
@@ -956,6 +993,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "accounting", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -980,6 +1018,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "income_account", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -1009,6 +1048,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "expense_account", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -1035,6 +1075,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "col_break4", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -1058,6 +1099,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": ":Company", 
   "fieldname": "cost_center", 
   "fieldtype": "Link", 
@@ -1089,6 +1131,7 @@
   "bold": 0, 
   "collapsible": 1, 
   "collapsible_depends_on": "eval:doc.serial_no || doc.batch_no", 
+   "columns": 0, 
   "fieldname": "warehouse_and_reference", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1113,6 +1156,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "warehouse", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -1140,6 +1184,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "target_warehouse", 
   "fieldtype": "Link", 
   "hidden": 1, 
@@ -1166,6 +1211,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "serial_no", 
   "fieldtype": "Small Text", 
   "hidden": 0, 
@@ -1192,6 +1238,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "batch_no", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -1217,6 +1264,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "", 
   "fieldname": "item_group", 
   "fieldtype": "Link", 
@@ -1245,6 +1293,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "brand", 
   "fieldtype": "Data", 
   "hidden": 1, 
@@ -1271,6 +1320,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "item_tax_rate", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
@@ -1297,6 +1347,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "col_break5", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -1320,6 +1371,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "actual_batch_qty", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -1347,6 +1399,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "actual_qty", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -1373,6 +1426,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "edit_references", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1398,6 +1452,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "sales_order", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -1425,6 +1480,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "so_detail", 
   "fieldtype": "Data", 
   "hidden": 1, 
@@ -1451,6 +1507,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_50", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -1475,6 +1532,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "delivery_note", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -1502,6 +1560,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "dn_detail", 
   "fieldtype": "Data", 
   "hidden": 1, 
@@ -1528,6 +1587,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "delivered_qty", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -1554,6 +1614,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "is_fixed_asset", 
   "fieldtype": "Check", 
   "hidden": 1, 
@@ -1579,6 +1640,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "asset", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -1605,6 +1667,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "section_break_54", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1629,6 +1692,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "page_break", 
   "fieldtype": "Check", 
   "hidden": 0, 
@@ -1660,7 +1724,7 @@
 "issingle": 0, 
 "istable": 1, 
 "max_attachments": 0, 
- "modified": "2016-07-11 03:28:07.483665", 
+ "modified": "2016-08-26 04:48:29.142409", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Sales Invoice Item", 
--- a/erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.json
+++ b/erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.json
@@ -14,6 +14,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "time_sheet", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -40,6 +41,33 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "billing_hours", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Billing Hours", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "billing_amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -60,6 +88,32 @@
   "search_index": 0, 
   "set_only_once": 0, 
   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "timesheet_detail", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Timesheet Detail", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
  }
 ], 
 "hide_heading": 0, 
@@ -72,7 +126,7 @@
 "issingle": 0, 
 "istable": 1, 
 "max_attachments": 0, 
- "modified": "2016-07-11 03:28:07.876168", 
+ "modified": "2016-09-09 14:01:04.095775", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Sales Invoice Timesheet", 
--- a/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
+++ b/erpnext/accounts/doctype/sales_taxes_and_charges/sales_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": 2, 
   "fieldname": "charge_type", 
   "fieldtype": "Select", 
   "hidden": 0, 
@@ -41,6 +43,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", 
@@ -68,13 +71,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, 
@@ -95,6 +99,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": ":Company", 
   "fieldname": "cost_center", 
   "fieldtype": "Link", 
@@ -123,6 +128,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "col_break_1", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -147,13 +153,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, 
@@ -175,6 +182,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", 
@@ -202,6 +210,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "section_break_8", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -226,6 +235,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 2, 
   "fieldname": "rate", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -252,6 +262,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "section_break_9", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -276,6 +287,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 2, 
   "fieldname": "tax_amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -302,13 +314,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, 
@@ -328,6 +341,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "tax_amount_after_discount_amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -354,6 +368,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_13", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -378,6 +393,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_tax_amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -405,6 +421,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_total", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -432,6 +449,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:parent.discount_amount", 
   "fieldname": "base_tax_amount_after_discount_amount", 
   "fieldtype": "Currency", 
@@ -458,6 +476,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "item_wise_tax_detail", 
   "fieldtype": "Code", 
   "hidden": 1, 
@@ -484,6 +503,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "parenttype", 
   "fieldtype": "Data", 
   "hidden": 1, 
@@ -517,7 +537,7 @@
 "issingle": 0, 
 "istable": 1, 
 "max_attachments": 0, 
- "modified": "2016-07-11 03:28:08.283145", 
+ "modified": "2016-08-26 03:08:03.235381", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Sales Taxes and Charges", 
--- a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py
+++ b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py
@@ -4,12 +4,18 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
+from frappe.utils import flt
 from frappe.model.document import Document
 from erpnext.controllers.accounts_controller import validate_taxes_and_charges, validate_inclusive_tax

 class SalesTaxesandChargesTemplate(Document):
 	def validate(self):
 		valdiate_taxes_and_charges_template(self)
+		
+	def set_missing_values(self):
+		for data in self.taxes:
+			if data.charge_type == 'On Net Total' and flt(data.rate) == 0.0:
+				data.rate = frappe.db.get_value('Account', data.account_head, 'tax_rate')

 def valdiate_taxes_and_charges_template(doc):
 	# default should not be disabled
--- a/erpnext/accounts/general_ledger.py
+++ b/erpnext/accounts/general_ledger.py
@@ -168,8 +168,8 @@ def delete_gl_entries(gl_entries=None, voucher_type=None, voucher_no=None,

 	if not gl_entries:
 		gl_entries = frappe.db.sql("""
-			select account, posting_date, party_type, party, cost_center, fiscal_year,
-			voucher_type, voucher_no, against_voucher_type, against_voucher, cost_center
+			select account, posting_date, party_type, party, cost_center, fiscal_year,voucher_type,
+			voucher_no, against_voucher_type, against_voucher, cost_center, company
 			from `tabGL Entry`
 			where voucher_type=%s and voucher_no=%s""", (voucher_type, voucher_no), as_dict=True)

--- a/erpnext/accounts/page/pos/pos.js
+++ b/erpnext/accounts/page/pos/pos.js
@@ -15,13 +15,11 @@ frappe.pages['pos'].refresh = function(wrapper) {
 	window.onbeforeunload = function () {
 		return wrapper.pos.beforeunload()
 	}
-	wrapper.pos.on_refresh_page()
 }


 erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 	init: function(wrapper){
-		this.load = true;
 		this.page = wrapper.page;
 		this.wrapper = $(wrapper).find('.page-content');
 		this.set_indicator();
@@ -31,17 +29,6 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 		this.si_docs = this.get_doc_from_localstorage();
 	},

-	on_refresh_page: function() {
-		var me = this;
-		if(this.load){
-			this.load = false;
-		}else if(this.connection_status){
-			this.onload();
-		}else{
-			this.create_new();
-		}
-	},
-
 	beforeunload: function(e){
 		if(this.connection_status == false && frappe.get_route()[0] == "pos"){
 			e = e || window.event;
@@ -111,6 +98,10 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 			})
 		});

+		this.page.add_menu_item(__("Sync Offline Invoices"), function(){
+			me.sync_sales_invoice()
+		});
+
 		this.page.add_menu_item(__("POS Profile"), function() {
 			frappe.set_route('List', 'POS Profile');
 		});
@@ -128,10 +119,11 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 		this.list_body = this.list_dialog.body;
 		if(this.si_docs.length > 0){
 			$(this.list_body).append('<div class="row list-row list-row-head pos-invoice-list">\
-					<div class="col-xs-2">Sr</div>\
-					<div class="col-xs-4">Customer</div>\
+					<div class="col-xs-1">Sr</div>\
+					<div class="col-xs-3">Customer</div>\
 					<div class="col-xs-2 text-left">Status</div>\
-					<div class="col-xs-4 text-right">Grand Total</div>\
+					<div class="col-xs-3 text-right">Paid Amount</div>\
+					<div class="col-xs-3 text-right">Grand Total</div>\
 			</div>')

 			$.each(this.si_docs, function(index, data){
@@ -140,6 +132,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 						sr: index + 1,
 						name: key,
 						customer: data[key].customer,
+						paid_amount: format_currency(data[key].paid_amount, me.frm.doc.currency),
 						grand_total: format_currency(data[key].grand_total, me.frm.doc.currency),
 						data: me.get_doctype_status(data[key])
 					})).appendTo($(me.list_body));
@@ -163,12 +156,12 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 	},

 	get_doctype_status: function(doc){
-		if(doc.outstanding_amount == 0){
-			return {status: "Paid", indicator: "green"}
-		}else if(doc.docstatus == 0){
+		if(doc.docstatus == 0) {
 			return {status: "Draft", indicator: "red"}
-		}else if(doc.paid_amount >= 0){
-			return {status: "Unpaid", indicator: "orange"}
+		}else if(doc.outstanding_amount == 0) {
+			return {status: "Paid", indicator: "green"}
+		}else {
+			return {status: "Submitted", indicator: "blue"}
 		}
 	},

@@ -253,7 +246,8 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 		})

 		this.print_template = frappe.render_template("print_template",
-			{content: window.print_template, title:"POS"})
+			{content: window.print_template, title:"POS",
+			base_url: frappe.urllib.get_base_url(), print_css: frappe.boot.print_css})
 	},

 	setup: function(){
@@ -313,6 +307,15 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 		});

 		this.party_field.make_input();
+		this.set_focus()
+	},
+
+	set_focus: function(){
+		if(this.default_customer){
+			this.search.$input.focus();
+		}else{
+			this.party_field.$input.focus();
+		}
 	},

 	make_customer: function() {
@@ -355,11 +358,14 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 	get_customers: function(key){
 		var me = this;
 		key = key.toLowerCase().trim()
+		var re = new RegExp('%', 'g');
+		var reg = new RegExp(key.replace(re, '\\w*\\s*[a-zA-Z0-9]*'))
+
 		if(key){
 			return $.grep(this.customers, function(data) {
-				if(data.name.toLowerCase().match(key)
-					|| data.customer_name.toLowerCase().match(key)
-					|| (data.customer_group && data.customer_group.toLowerCase().match(key))){
+				if(reg.test(data.name.toLowerCase())
+					|| reg.test(data.customer_name.toLowerCase())
+					|| (data.customer_group && reg.test(data.customer_group.toLowerCase()))){
 					return data
 				}
 			})
@@ -383,7 +389,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({

 		if (this.items) {
 			$.each(this.items, function(index, obj) {
-				if(index < 16){
+				if(index < 30){
 					$(frappe.render_template("pos_item", {
 						item_code: obj.name,
 						item_price: format_currency(obj.price_list_rate, obj.currency),
@@ -427,7 +433,9 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 			})
 		}

-		key = this.search.$input.val().toLowerCase();
+		key =  this.search.$input.val().toLowerCase();
+		var re = new RegExp('%', 'g');
+		var reg = new RegExp(key.replace(re, '[\\w*\\s*[a-zA-Z0-9]*]*'))
 		search_status = true

 		if(key){
@@ -443,8 +451,8 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 					} else if(item.barcode == me.search.$input.val()) {
 						search_status = false;
 						return item.barcode == me.search.$input.val();
-					} else if((item.item_code.toLowerCase().match(key)) ||
-						(item.item_name.toLowerCase().match(key)) || (item.item_group.toLowerCase().match(key))) {
+					} else if(reg.test(item.item_code.toLowerCase()) || reg.test(item.description.toLowerCase()) ||
+					reg.test(item.item_name.toLowerCase()) || reg.test(item.item_group.toLowerCase()) ){
 						return true
 					}
 				}
@@ -614,6 +622,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 		this.child.batch_no = this.item_batch_no[this.child.item_code];
 		this.child.serial_no = (this.item_serial_no[this.child.item_code]
 			? this.item_serial_no[this.child.item_code][0] : '');
+		this.child.item_tax_rate = this.items[0].taxes;
 	},

 	update_paid_amount_status: function(update_paid_amount){
@@ -654,7 +663,6 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 	show_items_in_item_cart: function() {
 		var me = this;
 		var $items = this.wrapper.find(".items").empty();
-		me.frm.doc.net_total = 0.0
 		$.each(this.frm.doc.items|| [], function(i, d) {
 			$(frappe.render_template("pos_bill_item", {
 				item_code: d.item_code,
@@ -727,6 +735,26 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 		}, "octicon octicon-plus").addClass("btn-primary");
 	},

+	print_dialog: function(){
+		var me = this;
+
+		msgprint = frappe.msgprint(format('<a class="btn btn-primary print_doc" \
+			style="margin-right: 5px;">{0}</a>\
+			<a class="btn btn-default new_doc">{1}</a>', [
+			__('Print'), __('New')
+		]));
+
+		$('.print_doc').click(function(){
+			html = frappe.render(me.print_template, me.frm.doc)
+			me.print_document(html)
+		})
+
+		$('.new_doc').click(function(){
+			msgprint.hide()
+			me.create_new();
+		})
+	},
+
 	print_document: function(html){
 		var w = window.open();
 		w.document.write(html);
@@ -739,10 +767,10 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({

 	submit_invoice: function(){
 		var me = this;
-		frappe.confirm(__("Do you really want to submit the invoice?"), function () {
-			me.change_status();
-			frappe.msgprint(__("Sales invoice submitted sucessfully."))
-		})
+		this.change_status();
+		if(this.frm.doc.docstatus == 1){
+			this.print_dialog()
+		}
 	},

 	change_status: function(){
@@ -775,6 +803,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 			this.update_invoice()
 		}else{
 			this.name = $.now();
+			this.frm.doc.offline_pos_name = this.name;
 			this.frm.doc.posting_date = frappe.datetime.get_today();
 			this.frm.doc.posting_time = frappe.datetime.now_time();
 			invoice_data[this.name] = this.frm.doc
@@ -1032,7 +1061,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({

 	validate_warehouse: function(){
 		if(!this.items[0].default_warehouse){
-			frappe.throw(__("Deafault warehouse is required for selected item"))
+			frappe.throw(__("Default warehouse is required for selected item"))
 		}
 	}
 })
--- a/erpnext/accounts/party_status.py
+++ b/erpnext/accounts/party_status.py
@@ -55,7 +55,6 @@ def notify_status(doc, method=None):
 		if party.status == 'Open':
 			# may be open elsewhere, check
 			# default status
-			party.status = status
 			update_status(party)

 	party.update_modified()
--- a/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html
+++ b/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html
@@ -2,7 +2,7 @@
 <div class="page-break">
    {%- if not doc.get("print_heading") and not doc.get("select_print_heading")
        and doc.set("select_print_heading", _("Payment Receipt Note")) -%}{%- endif -%}
-    {{ add_header(0, 1, doc, letter_head, no_letterhead) }}
+    {{ add_header(0, 1, doc, letter_head, no_letterhead, print_settings) }}

    {%- for label, value in (
        (_("Received On"), frappe.utils.formatdate(doc.voucher_date)),
--- a/erpnext/accounts/print_format/point_of_sale/point_of_sale.json
+++ b/erpnext/accounts/print_format/point_of_sale/point_of_sale.json
@@ -6,9 +6,9 @@
 "docstatus": 0, 
 "doctype": "Print Format", 
 "font": "Default", 
- "html": "<style>\n\t.print-format table, .print-format tr, \n\t.print-format td, .print-format div, .print-format p {\n\t\tfont-family: Monospace;\n\t\tline-height: 200%;\n\t\tvertical-align: middle;\n\t}\n\t@media screen {\n\t\t.print-format {\n\t\t\twidth: 4in;\n\t\t\tpadding: 0.25in;\n\t\t\tmin-height: 8in;\n\t\t}\n\t}\n</style>\n\n<p class=\"text-center\">\n\t{{ company }}<br>\n\t{{  __(\"Invoice\") }}<br>\n</p>\n<p>\n\t<b>{{ __(\"Date\") }}:</b> {{ dateutil.global_date_format(posting_date) }}<br>\n</p>\n\n<hr>\n<table class=\"table table-condensed cart no-border\">\n\t<thead>\n\t\t<tr>\n\t\t\t<th width=\"50%\">{{ __(\"Item\") }}</b></th>\n\t\t\t<th width=\"25%\" class=\"text-right\">{{ __(\"Qty\") }}</th>\n\t\t\t<th width=\"25%\" class=\"text-right\">{{ __(\"Amount\") }}</th>\n\t\t</tr>\n\t</thead>\n\t<tbody>\n\t\t{% for item in items %}\n\t\t<tr>\n\t\t\t<td>\n\t\t\t\t{{ item.item_name }}\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">{{ format_number(item.qty, precision(\"difference\")) }}<br>@ {{ format_currency(item.rate, currency) }}</td>\n\t\t\t<td class=\"text-right\">{{ format_currency(item.amount, currency) }}</td>\n\t\t</tr>\n\t\t{% endfor %}\n\t</tbody>\n</table>\n\n<table class=\"table table-condensed no-border\">\n\t<tbody>\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t{{ __(\"Net Total\") }}\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ format_currency(total, currency) }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{% for row in taxes %}\n\t\t{% if not row.included_in_print_rate %}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t{{ row.description }}\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ format_currency(row.tax_amount, currency) }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{% endif %}\n\t\t{% endfor %}\n\t\t{% if discount_amount %}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t{{ __(\"Discount\") }}\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ format_currency(discount_amount, currency) }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{% endif %}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t<b>{{ __(\"Grand Total\") }}</b>\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ format_currency(grand_total, currency) }}\n\t\t\t</td>\n\t\t</tr>\n\t</tbody>\n</table>\n\n\n<hr>\n<p class=\"text-center\">{{ __(\"Thank you, please visit again.\") }}</p>", 
+ "html": "<style>\n\t.print-format table, .print-format tr, \n\t.print-format td, .print-format div, .print-format p {\n\t\tfont-family: Monospace;\n\t\tline-height: 200%;\n\t\tvertical-align: middle;\n\t}\n\t@media screen {\n\t\t.print-format {\n\t\t\twidth: 4in;\n\t\t\tpadding: 0.25in;\n\t\t\tmin-height: 8in;\n\t\t}\n\t}\n</style>\n\n<p class=\"text-center\">\n\t{{ company }}<br>\n\t{{  __(\"POS No : \") }}{{offline_pos_name}}<br>\n</p>\n<p>\n\t<b>{{ __(\"Date\") }}:</b> {{ dateutil.global_date_format(posting_date) }}<br>\n</p>\n\n<hr>\n<table class=\"table table-condensed cart no-border\">\n\t<thead>\n\t\t<tr>\n\t\t\t<th width=\"50%\">{{ __(\"Item\") }}</b></th>\n\t\t\t<th width=\"25%\" class=\"text-right\">{{ __(\"Qty\") }}</th>\n\t\t\t<th width=\"25%\" class=\"text-right\">{{ __(\"Amount\") }}</th>\n\t\t</tr>\n\t</thead>\n\t<tbody>\n\t\t{% for item in items %}\n\t\t<tr>\n\t\t\t<td>\n\t\t\t\t{{ item.item_name }}\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">{{ format_number(item.qty, precision(\"difference\")) }}<br>@ {{ format_currency(item.rate, currency) }}</td>\n\t\t\t<td class=\"text-right\">{{ format_currency(item.amount, currency) }}</td>\n\t\t</tr>\n\t\t{% endfor %}\n\t</tbody>\n</table>\n\n<table class=\"table table-condensed no-border\">\n\t<tbody>\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t{{ __(\"Net Total\") }}\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ format_currency(total, currency) }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{% for row in taxes %}\n\t\t{% if not row.included_in_print_rate %}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t{{ row.description }}\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ format_currency(row.tax_amount, currency) }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{% endif %}\n\t\t{% endfor %}\n\t\t{% if discount_amount %}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t{{ __(\"Discount\") }}\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ format_currency(discount_amount, currency) }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{% endif %}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t<b>{{ __(\"Grand Total\") }}</b>\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ format_currency(grand_total, currency) }}\n\t\t\t</td>\n\t\t</tr>\n\t</tbody>\n</table>\n\n\n<hr>\n<p class=\"text-center\">{{ __(\"Thank you, please visit again.\") }}</p>", 
 "idx": 0, 
- "modified": "2016-08-11 07:23:04.530676", 
+ "modified": "2016-09-05 08:28:42.308782", 
 "modified_by": "Administrator", 
 "name": "Point of Sale", 
 "owner": "Administrator", 
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html
@@ -1,5 +1,5 @@
 <div style="margin-bottom: 7px;" class="text-center">
-	{%= frappe.boot.letter_heads[frappe.defaults.get_default("letter_head")] %}
+	{%= frappe.boot.letter_heads[frappe.get_doc(":Company", filters.company).default_letter_head || frappe.defaults.get_default("letter_head")] %}
 </div>
 <h2 class="text-center">{%= __(report.report_name) %}</h2>
 <h4 class="text-center">{%= filters.customer || filters.supplier %} </h4>
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -53,9 +53,9 @@ class ReceivablePayableReport(object):
 			self.filters["range3"] = "90"
 			
 		for label in ("0-{range1}".format(range1=self.filters["range1"]),
-			"{range1}-{range2}".format(range1=self.filters["range1"]+1, range2=self.filters["range2"]),
-			"{range2}-{range3}".format(range2=self.filters["range2"]+1, range3=self.filters["range3"]),
-			"{range3}-{above}".format(range3=self.filters["range3"] + 1, above=_("Above"))):
+			"{range1}-{range2}".format(range1=cint(self.filters["range1"])+ 1, range2=self.filters["range2"]),
+			"{range2}-{range3}".format(range2=cint(self.filters["range2"])+ 1, range3=self.filters["range3"]),
+			"{range3}-{above}".format(range3=cint(self.filters["range3"])+ 1, above=_("Above"))):
 				columns.append({
 					"label": label,
 					"fieldtype": "Currency",
@@ -93,9 +93,10 @@ class ReceivablePayableReport(object):
 		data = []
 		for gle in self.get_entries_till(self.filters.report_date, args.get("party_type")):
 			if self.is_receivable_or_payable(gle, dr_or_cr, future_vouchers):
-				outstanding_amount = self.get_outstanding_amount(gle, self.filters.report_date, dr_or_cr)
+				outstanding_amount = flt(self.get_outstanding_amount(gle, 
+					self.filters.report_date, dr_or_cr), currency_precision)
+					
 				if abs(outstanding_amount) > 0.1/10**currency_precision:
-
 					row = [gle.posting_date, gle.party]

 					# customer / supplier name
@@ -124,6 +125,10 @@ class ReceivablePayableReport(object):
 					row += get_ageing_data(cint(self.filters.range1), cint(self.filters.range2),
 						cint(self.filters.range3), self.age_as_on, entry_date, outstanding_amount)

+					# issue 6371-Ageing buckets should not have amounts if due date is not reached
+					if self.filters.ageing_based_on == "Due Date" and getdate(due_date) > getdate(self.filters.report_date):
+						row[-1]=row[-2]=row[-3]=row[-4]=0
+
 					if self.filters.get(scrub(args.get("party_type"))):
 						row.append(gle.account_currency)
 					else:
@@ -214,14 +219,16 @@ class ReceivablePayableReport(object):
 			conditions, values = self.prepare_conditions(party_type)

 			if self.filters.get(scrub(party_type)):
-				select_fields = "debit_in_account_currency as debit, credit_in_account_currency as credit"
+				select_fields = "sum(debit_in_account_currency) as debit, sum(credit_in_account_currency) as credit"
 			else:
-				select_fields = "debit, credit"
+				select_fields = "sum(debit) as debit, sum(credit) as credit"

-			self.gl_entries = frappe.db.sql("""select name, posting_date, account, party_type, party,
-				voucher_type, voucher_no, against_voucher_type, against_voucher, account_currency, remarks, {0}
+			self.gl_entries = frappe.db.sql("""select name, posting_date, account, party_type, party, 
+				voucher_type, voucher_no, against_voucher_type, against_voucher, 
+				account_currency, remarks, {0}
 				from `tabGL Entry`
 				where docstatus < 2 and party_type=%s and (party is not null and party != '') {1}
+				group by voucher_type, voucher_no, against_voucher_type, against_voucher, party
 				order by posting_date, party"""
 				.format(select_fields, conditions), values, as_dict=True)

--- a/erpnext/accounts/report/balance_sheet/balance_sheet.py
+++ b/erpnext/accounts/report/balance_sheet/balance_sheet.py
@@ -8,23 +8,38 @@ from frappe.utils import flt
 from erpnext.accounts.report.financial_statements import (get_period_list, get_columns, get_data)

 def execute(filters=None):
-	period_list = get_period_list(filters.fiscal_year, filters.periodicity)
+	period_list = get_period_list(filters.from_fiscal_year, filters.to_fiscal_year, filters.periodicity)

 	asset = get_data(filters.company, "Asset", "Debit", period_list, only_current_fiscal_year=False)
 	liability = get_data(filters.company, "Liability", "Credit", period_list, only_current_fiscal_year=False)
 	equity = get_data(filters.company, "Equity", "Credit", period_list, only_current_fiscal_year=False)

-	provisional_profit_loss = get_provisional_profit_loss(asset, liability, equity,
+	provisional_profit_loss,total_credit  = get_provisional_profit_loss(asset, liability, equity,
 		period_list, filters.company)

-	message = check_opening_balance(asset, liability, equity)
+	message,opening_balance = check_opening_balance(asset, liability, equity)

 	data = []
 	data.extend(asset or [])
 	data.extend(liability or [])
 	data.extend(equity or [])
+	if opening_balance and round(opening_balance,2) !=0:
+		unclosed ={
+			"account_name": "'" + _("Unclosed Fiscal Years Profit / Loss (Credit)") + "'",
+			"account": None,
+			"warn_if_negative": True,
+			"currency": frappe.db.get_value("Company", filters.company, "default_currency")
+		}
+		for period in period_list:
+			unclosed[period.key] = opening_balance
+			provisional_profit_loss[period.key] = provisional_profit_loss[period.key] - opening_balance
+		unclosed["total"]=opening_balance
+		data.append(unclosed)
+		
 	if provisional_profit_loss:
 		data.append(provisional_profit_loss)
+	if total_credit:
+		data.append(total_credit)		

 	columns = get_columns(filters.periodicity, period_list, company=filters.company)
 	
@@ -34,14 +49,20 @@ def execute(filters=None):

 def get_provisional_profit_loss(asset, liability, equity, period_list, company):
 	if asset and (liability or equity):
-		total=0
+		total = total_row_total=0
+		currency = frappe.db.get_value("Company", company, "default_currency")
 		provisional_profit_loss = {
 			"account_name": "'" + _("Provisional Profit / Loss (Credit)") + "'",
 			"account": None,
 			"warn_if_negative": True,
-			"currency": frappe.db.get_value("Company", company, "default_currency")
+			"currency": currency
+		}
+		total_row = {
+			"account_name": "'" + _("Total (Credit)") + "'",
+			"account": None,
+			"warn_if_negative": True,
+			"currency": currency
 		}
-
 		has_value = False

 		for period in period_list:
@@ -52,15 +73,21 @@ def get_provisional_profit_loss(asset, liability, equity, period_list, company):
 				effective_liability += flt(equity[-2].get(period.key))

 			provisional_profit_loss[period.key] = flt(asset[-2].get(period.key)) - effective_liability
+			total_row[period.key] = effective_liability + provisional_profit_loss[period.key]

 			if provisional_profit_loss[period.key]:
 				has_value = True

 			total += flt(provisional_profit_loss[period.key])
 			provisional_profit_loss["total"] = total
+			
+			total_row_total += flt(total_row[period.key])
+			total_row["total"] = total_row_total

 		if has_value:
-			return provisional_profit_loss
+			return provisional_profit_loss, total_row
+		return None,total_row
+	return None, None	

 def check_opening_balance(asset, liability, equity):
 	# Check if previous year balance sheet closed
@@ -70,10 +97,11 @@ def check_opening_balance(asset, liability, equity):
 	if liability:
 		opening_balance -= flt(liability[0].get("opening_balance", 0))
 	if equity:
-		opening_balance -= flt(asset[0].get("opening_balance", 0))
+		opening_balance -= flt(equity[0].get("opening_balance", 0))

 	if opening_balance:
-		return _("Previous Financial Year is not closed")
+		return _("Previous Financial Year is not closed"),opening_balance
+	return None,None
 		
 def get_chart_data(columns, asset, liability, equity):
 	x_intervals = ['x'] + [d.get("label") for d in columns[2:]]
@@ -101,4 +129,4 @@ def get_chart_data(columns, asset, liability, equity):
 			'x': 'x',
 			'columns': columns
 		}
-	}
+	}
--- a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py
+++ b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py
@@ -16,7 +16,7 @@ def execute(filters=None):

 def get_columns():
 	return [
-		_("Payment Document") + ":Link/DocType:130",
+		_("Payment Document") + "::130",
 		_("Payment Entry") + ":Dynamic Link/"+_("Payment Document")+":110",
 		_("Posting Date") + ":Date:100",
 		_("Cheque/Reference No") + "::120",
--- a/erpnext/accounts/report/budget_variance_report/budget_variance_report.py
+++ b/erpnext/accounts/report/budget_variance_report/budget_variance_report.py
@@ -64,7 +64,7 @@ def get_cost_center_target_details(filters):
 	return frappe.db.sql("""
 			select b.cost_center, b.monthly_distribution, ba.account, ba.budget_amount
 			from `tabBudget` b, `tabBudget Account` ba
-			where b.name=ba.parent and b.fiscal_year=%s and b.company=%s
+			where b.name=ba.parent and b.docstatus = 1 and b.fiscal_year=%s and b.company=%s 
 		""", (filters.fiscal_year, filters.company), as_dict=True)

 #Get target distribution details of accounts of cost center
@@ -84,8 +84,9 @@ def get_actual_details(cost_center, fiscal_year):
 	ac_details = frappe.db.sql("""select gl.account, gl.debit, gl.credit,
 		MONTHNAME(gl.posting_date) as month_name, b.cost_center
 		from `tabGL Entry` gl, `tabBudget Account` ba, `tabBudget` b
-		where 
+		where
 			b.name = ba.parent
+			and b.docstatus = 1
 			and ba.account=gl.account 
 			and gl.fiscal_year=%s 
 			and b.cost_center=%s
--- a/erpnext/accounts/report/cash_flow/cash_flow.js
+++ b/erpnext/accounts/report/cash_flow/cash_flow.js
@@ -2,7 +2,8 @@
 // For license information, please see license.txt

 frappe.require("assets/erpnext/js/financial_statements.js", function() {
-	frappe.query_reports["Cash Flow"] = erpnext.financial_statements;
+	frappe.query_reports["Cash Flow"] = $.extend({},
+		erpnext.financial_statements);

 	frappe.query_reports["Cash Flow"]["filters"].push({
 		"fieldname": "accumulated_values",
--- a/erpnext/accounts/report/cash_flow/cash_flow.py
+++ b/erpnext/accounts/report/cash_flow/cash_flow.py
@@ -6,10 +6,11 @@ import frappe
 from frappe import _
 from erpnext.accounts.report.financial_statements import (get_period_list, get_columns, get_data)
 from erpnext.accounts.report.profit_and_loss_statement.profit_and_loss_statement import get_net_profit_loss
+from erpnext.accounts.utils import get_fiscal_year


 def execute(filters=None):
-	period_list = get_period_list(filters.fiscal_year, filters.periodicity)
+	period_list = get_period_list(filters.from_fiscal_year, filters.to_fiscal_year, filters.periodicity)

 	operation_accounts = {
 		"section_name": "Operations",
@@ -49,9 +50,9 @@ def execute(filters=None):

 	# compute net profit / loss
 	income = get_data(filters.company, "Income", "Credit", period_list, 
-		accumulated_values=filters.accumulated_values, ignore_closing_entries=True)
+		accumulated_values=filters.accumulated_values, ignore_closing_entries=True, ignore_accumulated_values_for_fy= True)
 	expense = get_data(filters.company, "Expense", "Debit", period_list, 
-		accumulated_values=filters.accumulated_values, ignore_closing_entries=True)
+		accumulated_values=filters.accumulated_values, ignore_closing_entries=True, ignore_accumulated_values_for_fy= True)
 		
 	net_profit_loss = get_net_profit_loss(income, expense, period_list, filters.company)

@@ -59,7 +60,6 @@ def execute(filters=None):
 	company_currency = frappe.db.get_value("Company", filters.company, "default_currency")
 	
 	for cash_flow_account in cash_flow_accounts:
-
 		section_data = []
 		data.append({
 			"account_name": cash_flow_account['section_header'], 
@@ -82,7 +82,8 @@ def execute(filters=None):
 			account_data = get_account_type_based_data(filters.company, 
 				account['account_type'], period_list, filters.accumulated_values)
 			account_data.update({
-				"account_name": account['label'], 
+				"account_name": account['label'],
+				"account": account['label'], 
 				"indent": 1,
 				"parent_account": cash_flow_account['section_header'],
 				"currency": company_currency
@@ -98,38 +99,44 @@ def execute(filters=None):

 	return columns, data

-
 def get_account_type_based_data(company, account_type, period_list, accumulated_values):
 	data = {}
 	total = 0
 	for period in period_list:
+		start_date = get_start_date(period, accumulated_values)
 		gl_sum = frappe.db.sql_list("""
 			select sum(credit) - sum(debit)
 			from `tabGL Entry`
 			where company=%s and posting_date >= %s and posting_date <= %s 
 				and voucher_type != 'Period Closing Voucher'
 				and account in ( SELECT name FROM tabAccount WHERE account_type = %s)
-		""", (company, period["year_start_date"] if accumulated_values else period['from_date'], 
+		""", (company, start_date if accumulated_values else period['from_date'],
 			period['to_date'], account_type))
-		
+
 		if gl_sum and gl_sum[0]:
 			amount = gl_sum[0]
 			if account_type == "Depreciation":
 				amount *= -1
 		else:
 			amount = 0
-			
+
 		total += amount
 		data.setdefault(period["key"], amount)
-		
+
 	data["total"] = total
 	return data

+def get_start_date(period, accumulated_values):
+	start_date = period["year_start_date"]
+	if accumulated_values:
+		start_date = get_fiscal_year(period.to_date)[1]
+
+	return start_date

 def add_total_row_account(out, data, label, period_list, currency):
 	total_row = {
 		"account_name": "'" + _("{0}").format(label) + "'",
-		"account": None,
+		"account": "'" + _("{0}").format(label) + "'",
 		"currency": currency
 	}
 	for row in data:
--- a/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.json
+++ b/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.json
@@ -7,12 +7,12 @@
 "doctype": "Report", 
 "idx": 1, 
 "is_standard": "Yes", 
- "modified": "2016-05-17 08:40:18.711626", 
+ "modified": "2016-08-18 14:29:50.680329", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Delivered Items To Be Billed", 
 "owner": "Administrator", 
- "query": "select\n    `tabDelivery Note`.`name` as \"Delivery Note:Link/Delivery Note:120\",\n\t`tabDelivery Note`.`customer` as \"Customer:Link/Customer:120\",\n\t`tabDelivery Note`.`posting_date` as \"Date:Date\",\n\t`tabDelivery Note`.`project` as \"Project\",\n\t`tabDelivery Note Item`.`item_code` as \"Item:Link/Item:120\",\n\t(`tabDelivery Note Item`.`base_amount` - `tabDelivery Note Item`.`billed_amt`*ifnull(`tabDelivery Note`.conversion_rate, 1)) as \"Pending Amount:Currency:110\",\n\t`tabDelivery Note Item`.`item_name` as \"Item Name::150\",\n\t`tabDelivery Note Item`.`description` as \"Description::200\",\n\t`tabDelivery Note`.`company` as \"Company:Link/Company:\"\nfrom `tabDelivery Note`, `tabDelivery Note Item`\nwhere  \n    `tabDelivery Note`.name = `tabDelivery Note Item`.parent \n    and `tabDelivery Note`.docstatus = 1 \n    and `tabDelivery Note`.`status` not in (\"Stopped\", \"Closed\") \n    and `tabDelivery Note Item`.amount > 0\n    and `tabDelivery Note Item`.billed_amt < `tabDelivery Note Item`.amount\norder by `tabDelivery Note`.`name` desc", 
+ "query": "select\n    `tabDelivery Note`.`name` as \"Delivery Note:Link/Delivery Note:120\",\n\t`tabDelivery Note`.`customer` as \"Customer:Link/Customer:120\",\n\t`tabDelivery Note`.`customer_name` as \"Customer Name::150\",\n\t`tabDelivery Note`.`posting_date` as \"Date:Date\",\n\t`tabDelivery Note`.`project` as \"Project\",\n\t`tabDelivery Note Item`.`item_code` as \"Item:Link/Item:120\",\n\t(`tabDelivery Note Item`.`base_amount` - `tabDelivery Note Item`.`billed_amt`*ifnull(`tabDelivery Note`.conversion_rate, 1)) as \"Pending Amount:Currency:110\",\n\t`tabDelivery Note Item`.`item_name` as \"Item Name::150\",\n\t`tabDelivery Note Item`.`description` as \"Description::200\",\n\t`tabDelivery Note`.`company` as \"Company:Link/Company:\"\nfrom `tabDelivery Note`, `tabDelivery Note Item`\nwhere  \n    `tabDelivery Note`.name = `tabDelivery Note Item`.parent \n    and `tabDelivery Note`.docstatus = 1 \n    and `tabDelivery Note`.`status` not in (\"Stopped\", \"Closed\") \n    and `tabDelivery Note Item`.amount > 0\n    and `tabDelivery Note Item`.billed_amt < `tabDelivery Note Item`.amount\norder by `tabDelivery Note`.`name` desc", 
 "ref_doctype": "Sales Invoice", 
 "report_name": "Delivered Items To Be Billed", 
 "report_type": "Query Report"
--- a/erpnext/accounts/report/financial_statements.html
+++ b/erpnext/accounts/report/financial_statements.html
@@ -13,7 +13,9 @@
 		height: 37px;
 	}
 </style>
-
+<div style="margin-bottom: 7px;" class="text-center">
+	{%= frappe.boot.letter_heads[frappe.get_doc(":Company", filters.company).default_letter_head || frappe.defaults.get_default("letter_head")] %}
+</div>
 <h2 class="text-center">{%= __(report.report_name) %}</h2>
 <h4 class="text-center">{%= filters.company %}</h3>
 <h4 class="text-center">{%= filters.fiscal_year %}</h3>
--- a/erpnext/accounts/report/financial_statements.py
+++ b/erpnext/accounts/report/financial_statements.py
@@ -3,61 +3,63 @@

 from __future__ import unicode_literals
 import frappe
+import math
 from frappe import _
-from frappe.utils import (flt, getdate, get_first_day, get_last_day,
-	add_months, add_days, formatdate)
+from frappe.utils import (flt, getdate, get_first_day, get_last_day, date_diff,
+	add_months, add_days, formatdate, cint)

-def get_period_list(fiscal_year, periodicity):
+def get_period_list(from_fiscal_year, to_fiscal_year, periodicity):
 	"""Get a list of dict {"from_date": from_date, "to_date": to_date, "key": key, "label": label}
 		Periodicity can be (Yearly, Quarterly, Monthly)"""

-	fy_start_end_date = frappe.db.get_value("Fiscal Year", fiscal_year, ["year_start_date", "year_end_date"])
-	if not fy_start_end_date:
-		frappe.throw(_("Fiscal Year {0} not found.").format(fiscal_year))
+	fiscal_year = get_fiscal_year_data(from_fiscal_year, to_fiscal_year)
+	validate_fiscal_year(fiscal_year, from_fiscal_year, to_fiscal_year)

 	# start with first day, so as to avoid year to_dates like 2-April if ever they occur]
-	year_start_date = get_first_day(getdate(fy_start_end_date[0]))
-	year_end_date = getdate(fy_start_end_date[1])
-	
-	if periodicity == "Yearly":
-		period_list = [frappe._dict({"from_date": year_start_date, "to_date": year_end_date, 
-			"key": fiscal_year, "label": fiscal_year})]
-	else:
-		months_to_add = {
-			"Half-Yearly": 6,
-			"Quarterly": 3,
-			"Monthly": 1
-		}[periodicity]
+	year_start_date = getdate(fiscal_year.year_start_date)
+	year_end_date = getdate(fiscal_year.year_end_date)

-		period_list = []
+	months_to_add = {
+		"Yearly": 12,
+		"Half-Yearly": 6,
+		"Quarterly": 3,
+		"Monthly": 1
+	}[periodicity]

-		start_date = year_start_date
-		for i in xrange(12 / months_to_add):
-			period = frappe._dict({
-				"from_date": start_date
-			})
-			to_date = add_months(start_date, months_to_add)
-			start_date = to_date
-			
-			if to_date == get_first_day(to_date):
-				# if to_date is the first day, get the last day of previous month
-				to_date = add_days(to_date, -1)
-			else:
-				# to_date should be the last day of the new to_date's month
-				to_date = get_last_day(to_date)
+	period_list = []
+
+	start_date = year_start_date
+	months = get_months(year_start_date, year_end_date)
+
+	for i in xrange(months / months_to_add):
+		period = frappe._dict({
+			"from_date": start_date
+		})
+
+		to_date = add_months(start_date, months_to_add)
+		start_date = to_date
+
+		if to_date == get_first_day(to_date):
+			# if to_date is the first day, get the last day of previous month
+			to_date = add_days(to_date, -1)
+		else:
+			# to_date should be the last day of the new to_date's month
+			to_date = get_last_day(to_date)
+
+		if to_date <= year_end_date:
+			# the normal case
+			period.to_date = to_date
+		else:
+			# if a fiscal year ends before a 12 month period
+			period.to_date = year_end_date
+
+		period.to_date_fiscal_year = get_date_fiscal_year(period.to_date)
+
+		period_list.append(period)
+
+		if period.to_date == year_end_date:
+			break

-			if to_date <= year_end_date:
-				# the normal case
-				period.to_date = to_date
-			else:
-				# if a fiscal year ends before a 12 month period
-				period.to_date = year_end_date
-			
-			period_list.append(period)
-			
-			if period.to_date == year_end_date:
-				break
-				
 	# common processing
 	for opts in period_list:
 		key = opts["to_date"].strftime("%b_%Y").lower()
@@ -75,6 +77,22 @@ def get_period_list(fiscal_year, periodicity):

 	return period_list

+def get_fiscal_year_data(from_fiscal_year, to_fiscal_year):
+	fiscal_year = frappe.db.sql("""select min(year_start_date) as year_start_date, 
+		max(year_end_date) as year_end_date from `tabFiscal Year` where 
+		name between %(from_fiscal_year)s and %(to_fiscal_year)s""",
+		{'from_fiscal_year': from_fiscal_year, 'to_fiscal_year': to_fiscal_year}, as_dict=1)
+
+	return fiscal_year[0] if fiscal_year else {}
+
+def validate_fiscal_year(fiscal_year, from_fiscal_year, to_fiscal_year):
+	if not fiscal_year.get('year_start_date') and not fiscal_year.get('year_end_date'):
+		frappe.throw(_("End Year cannot be before Start Year"))
+
+def get_months(start_date, end_date):
+	diff = (12 * end_date.year + end_date.month) - (12 * start_date.year + start_date.month)
+	return diff + 1
+
 def get_label(periodicity, from_date, to_date):
 	if periodicity=="Yearly":
 		if formatdate(from_date, "YYYY") == formatdate(to_date, "YYYY"):
@@ -86,8 +104,9 @@ def get_label(periodicity, from_date, to_date):

 	return label
 	
-def get_data(company, root_type, balance_must_be, period_list, 
-		accumulated_values=1, only_current_fiscal_year=True, ignore_closing_entries=False):
+def get_data(company, root_type, balance_must_be, period_list, filters=None,
+		accumulated_values=1, only_current_fiscal_year=True, ignore_closing_entries=False,
+		ignore_accumulated_values_for_fy=False):
 	accounts = get_accounts(company, root_type)
 	if not accounts:
 		return None
@@ -103,10 +122,10 @@ def get_data(company, root_type, balance_must_be, period_list,
 		set_gl_entries_by_account(company, 
 			period_list[0]["year_start_date"] if only_current_fiscal_year else None,
 			period_list[-1]["to_date"], 
-			root.lft, root.rgt, 
+			root.lft, root.rgt, filters,
 			gl_entries_by_account, ignore_closing_entries=ignore_closing_entries)

-	calculate_values(accounts_by_name, gl_entries_by_account, period_list, accumulated_values)
+	calculate_values(accounts_by_name, gl_entries_by_account, period_list, accumulated_values, ignore_accumulated_values_for_fy)
 	accumulate_values_into_parents(accounts, accounts_by_name, period_list, accumulated_values)
 	out = prepare_data(accounts, balance_must_be, period_list, company_currency)
 	out = filter_out_zero_value_rows(out, parent_children_map)
@@ -116,18 +135,25 @@ def get_data(company, root_type, balance_must_be, period_list,

 	return out

-def calculate_values(accounts_by_name, gl_entries_by_account, period_list, accumulated_values):
+def calculate_values(accounts_by_name, gl_entries_by_account, period_list, accumulated_values, ignore_accumulated_values_for_fy):
 	for entries in gl_entries_by_account.values():
 		for entry in entries:
 			d = accounts_by_name.get(entry.account)
 			for period in period_list:
 				# check if posting date is within the period
+
 				if entry.posting_date <= period.to_date:
-					if accumulated_values or entry.posting_date >= period.from_date:
+					if (accumulated_values or entry.posting_date >= period.from_date) and \
+						(entry.fiscal_year == period.to_date_fiscal_year or not ignore_accumulated_values_for_fy):
 						d[period.key] = d.get(period.key, 0.0) + flt(entry.debit) - flt(entry.credit)
-						
+
 			if entry.posting_date < period_list[0].year_start_date:
 				d["opening_balance"] = d.get("opening_balance", 0.0) + flt(entry.debit) - flt(entry.credit)
+				
+def get_date_fiscal_year(date):
+	from erpnext.accounts.utils import get_fiscal_year
+	
+	return get_fiscal_year(date)[0]

 def accumulate_values_into_parents(accounts, accounts_by_name, period_list, accumulated_values):
 	"""accumulate children's values in parent accounts"""
@@ -261,24 +287,19 @@ def sort_root_accounts(roots):

 	roots.sort(compare_roots)

-def set_gl_entries_by_account(company, from_date, to_date, root_lft, root_rgt, gl_entries_by_account,
+def set_gl_entries_by_account(company, from_date, to_date, root_lft, root_rgt, filters, gl_entries_by_account,
 		ignore_closing_entries=False):
 	"""Returns a dict like { "account": [gl entries], ... }"""
-	additional_conditions = []

-	if ignore_closing_entries:
-		additional_conditions.append("and ifnull(voucher_type, '')!='Period Closing Voucher'")
+	additional_conditions = get_additional_conditions(from_date, ignore_closing_entries, filters)

-	if from_date:
-		additional_conditions.append("and posting_date >= %(from_date)s")
-
-	gl_entries = frappe.db.sql("""select posting_date, account, debit, credit, is_opening from `tabGL Entry`
+	gl_entries = frappe.db.sql("""select posting_date, account, debit, credit, is_opening, fiscal_year from `tabGL Entry`
 		where company=%(company)s
 		{additional_conditions}
 		and posting_date <= %(to_date)s
 		and account in (select name from `tabAccount`
 			where lft >= %(lft)s and rgt <= %(rgt)s)
-		order by account, posting_date""".format(additional_conditions="\n".join(additional_conditions)),
+		order by account, posting_date""".format(additional_conditions=additional_conditions),
 		{
 			"company": company,
 			"from_date": from_date,
@@ -293,6 +314,22 @@ def set_gl_entries_by_account(company, from_date, to_date, root_lft, root_rgt, g

 	return gl_entries_by_account

+def get_additional_conditions(from_date, ignore_closing_entries, filters):
+	additional_conditions = []
+
+	if ignore_closing_entries:
+		additional_conditions.append("ifnull(voucher_type, '')!='Period Closing Voucher'")
+
+	if from_date:
+		additional_conditions.append("posting_date >= %(from_date)s")
+
+	if filters:
+		for key in ['cost_center', 'project']:
+			if filters.get(key):
+				additional_conditions.append("%s = '%s'"%(key, filters.get(key)))
+
+	return " and {}".format(" and ".join(additional_conditions)) if additional_conditions else ""
+
 def get_columns(periodicity, period_list, accumulated_values=1, company=None):
 	columns = [{
 		"fieldname": "account",
--- a/erpnext/accounts/report/general_ledger/general_ledger.html
+++ b/erpnext/accounts/report/general_ledger/general_ledger.html
@@ -1,5 +1,5 @@
 <div style="margin-bottom: 7px;" class="text-center">
-	{%= frappe.boot.letter_heads[filters.letter_head || frappe.defaults.get_default("letter_head")] %}
+	{%= frappe.boot.letter_heads[filters.letter_head || frappe.get_doc(":Company", filters.company).default_letter_head || frappe.defaults.get_default("letter_head")] %}
 </div>
 <h2 class="text-center">{%= __("Statement of Account") %}</h2>
 <h4 class="text-center">{%= (filters.party || filters.account) && ((filters.party || filters.account) + ", ")  || "" %} {%= filters.company %}</h4>
--- a/erpnext/accounts/report/general_ledger/general_ledger.js
+++ b/erpnext/accounts/report/general_ledger/general_ledger.js
@@ -33,7 +33,7 @@ frappe.query_reports["General Ledger"] = {
 			"fieldtype": "Link",
 			"options": "Account",
 			"get_query": function() {
-				var company = frappe.query_report.filters_by_name.company.get_value();
+				var company = frappe.query_report_filters_by_name.company.get_value();
 				return {
 					"doctype": "Account",
 					"filters": {
@@ -62,8 +62,8 @@ frappe.query_reports["General Ledger"] = {
 			"label": __("Party"),
 			"fieldtype": "Dynamic Link",
 			"get_options": function() {
-				var party_type = frappe.query_report.filters_by_name.party_type.get_value();
-				var party = frappe.query_report.filters_by_name.party.get_value();
+				var party_type = frappe.query_report_filters_by_name.party_type.get_value();
+				var party = frappe.query_report_filters_by_name.party.get_value();
 				if(party && !party_type) {
 					frappe.throw(__("Please select Party Type first"));
 				}
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@ -91,6 +91,7 @@ def get_columns(filters):
 		_("Voucher Type") + "::120", _("Voucher No") + ":Dynamic Link/"+_("Voucher Type")+":160",
 		_("Against Account") + "::120", _("Party Type") + "::80", _("Party") + "::150",
 		_("Project") + ":Link/Project:100", _("Cost Center") + ":Link/Cost Center:100",
+		_("Against Voucher Type") + "::120", _("Against Voucher") + ":Dynamic Link/"+_("Against Voucher Type")+":160",
 		_("Remarks") + "::400"
 	]

@@ -118,6 +119,7 @@ def get_gl_entries(filters):
 			posting_date, account, party_type, party,
 			sum(debit) as debit, sum(credit) as credit,
 			voucher_type, voucher_no, cost_center, project,
+			against_voucher_type, against_voucher,
 			remarks, against, is_opening {select_fields}
 		from `tabGL Entry`
 		where company=%(company)s {conditions}
@@ -290,7 +292,7 @@ def get_result_as_list(data, filters):
 			row += [d.get("debit_in_account_currency"), d.get("credit_in_account_currency")]

 		row += [d.get("voucher_type"), d.get("voucher_no"), d.get("against"),
-			d.get("party_type"), d.get("party"), d.get("project"), d.get("cost_center"), d.get("remarks")
+			d.get("party_type"), d.get("party"), d.get("project"), d.get("cost_center"), d.get("against_voucher_type"), d.get("against_voucher"), d.get("remarks")
 		]

 		result.append(row)
--- a/erpnext/accounts/report/gross_profit/gross_profit.py
+++ b/erpnext/accounts/report/gross_profit/gross_profit.py
@@ -6,6 +6,7 @@ import frappe
 from frappe import _, scrub
 from frappe.utils import flt

+
 def execute(filters=None):
 	if not filters: filters = frappe._dict()
 	company_currency = frappe.db.get_value("Company", filters.company, "default_currency")
@@ -16,7 +17,7 @@ def execute(filters=None):
 	source = gross_profit_data.grouped_data if filters.get("group_by") != "Invoice" else gross_profit_data.data

 	group_wise_columns = frappe._dict({
-		"invoice": ["parent", "customer", "posting_date","item_code", "item_name","item_group", "brand", "description", \
+		"invoice": ["parent", "customer", "customer_group", "posting_date","item_code", "item_name","item_group", "brand", "description", \
 			"warehouse", "qty", "base_rate", "buying_rate", "base_amount",
 			"buying_amount", "gross_profit", "gross_profit_percent", "project"],
 		"item_code": ["item_code", "item_name", "brand", "description", "qty", "base_rate",
@@ -188,8 +189,8 @@ class GrossProfitGenerator(object):
 		# stock_ledger_entries should already be filtered by item_code and warehouse and
 		# sorted by posting_date desc, posting_time desc
 		if item_code in self.non_stock_items:
-			# average purchasing rate for non-stock items
-			item_rate = self.get_average_buying_rate(item_code)
+			#Issue 6089-Get last purchasing rate for non-stock item
+			item_rate = self.get_last_purchase_rate(item_code)
 			return flt(row.qty) * item_rate

 		else:
@@ -225,6 +226,22 @@ class GrossProfitGenerator(object):

 		return self.average_buying_rate[item_code]

+	def get_last_purchase_rate(self, item_code):
+		if self.filters.to_date:
+			last_purchase_rate = frappe.db.sql("""
+			select (a.base_rate / a.conversion_factor)
+			from `tabPurchase Invoice Item` a
+			where a.item_code = %s and a.docstatus=1
+			and modified <= %s 
+			order by a.modified desc limit 1""", (item_code,self.filters.to_date))
+		else:
+			last_purchase_rate = frappe.db.sql("""
+			select (a.base_rate / a.conversion_factor)
+			from `tabPurchase Invoice Item` a
+			where a.item_code = %s and a.docstatus=1
+			order by a.modified desc limit 1""", item_code)
+		return flt(last_purchase_rate[0][0]) if last_purchase_rate else 0
+
 	def load_invoice_items(self):
 		conditions = ""
 		if self.filters.company:
--- a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
+++ b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
@@ -5,6 +5,7 @@ from __future__ import unicode_literals
 import frappe
 from frappe import _
 from frappe.utils import flt
+from erpnext.accounts.report.sales_register.sales_register import get_mode_of_payments

 def execute(filters=None):
 	if not filters: filters = {}
@@ -21,6 +22,7 @@ def execute(filters=None):
 		"width": 80
 	})
 	company_currency = frappe.db.get_value("Company", filters.company, "default_currency")
+	mode_of_payments = get_mode_of_payments(set([d.parent for d in item_list]))

 	data = []
 	for d in item_list:
@@ -30,9 +32,12 @@ def execute(filters=None):
 		elif d.so_detail:
 			delivery_note = ", ".join(frappe.db.sql_list("""select distinct parent
 			from `tabDelivery Note Item` where docstatus=1 and so_detail=%s""", d.so_detail))
+		if not delivery_note and d.update_stock:
+			delivery_note = d.parent

 		row = [d.item_code, d.item_name, d.item_group, d.parent, d.posting_date, d.customer, d.customer_name,
-			d.customer_group, d.debit_to, d.mode_of_payment, d.territory, d.project, d.company, d.sales_order,
+			d.customer_group, d.debit_to, ", ".join(mode_of_payments.get(d.parent, [])), 
+			d.territory, d.project, d.company, d.sales_order,
 			delivery_note, d.income_account, d.cost_center, d.qty, d.base_net_rate, d.base_net_amount]

 		for tax in tax_accounts:
@@ -52,7 +57,7 @@ def get_columns():
 		_("Posting Date") + ":Date:80", _("Customer") + ":Link/Customer:120",
 		_("Customer Name") + "::120", _("Customer Group") + ":Link/Customer Group:120",
 		_("Receivable Account") + ":Link/Account:120",
-		_("Mode of Payment") + ":Link/Mode of Payment:80", _("Territory") + ":Link/Territory:80",
+		_("Mode of Payment") + "::120", _("Territory") + ":Link/Territory:80",
 		_("Project") + ":Link/Project:80", _("Company") + ":Link/Company:100",
 		_("Sales Order") + ":Link/Sales Order:100", _("Delivery Note") + ":Link/Delivery Note:100",
 		_("Income Account") + ":Link/Account:140", _("Cost Center") + ":Link/Cost Center:140",
@@ -68,10 +73,14 @@ def get_conditions(filters):
 		("customer", " and si.customer = %(customer)s"),
 		("item_code", " and si_item.item_code = %(item_code)s"),
 		("from_date", " and si.posting_date>=%(from_date)s"),
-		("to_date", " and si.posting_date<=%(to_date)s"),
-		("mode_of_payment", " and ifnull(mode_of_payment, '') = %(mode_of_payment)s")):
+		("to_date", " and si.posting_date<=%(to_date)s")):
 			if filters.get(opts[0]):
 				conditions += opts[1]
+				
+	if filters.get("mode_of_payment"):
+		conditions += """ and exists(select name from `tabSales Invoice Payment`
+			 where parent=si.name 
+			 	and ifnull(`tabSales Invoice Payment`.mode_of_payment, '') = %(mode_of_payment)s)"""

 	return conditions

@@ -84,7 +93,7 @@ def get_items(filters):
 			si_item.item_code, si_item.item_name, si_item.item_group, si_item.sales_order,
 			si_item.delivery_note, si_item.income_account, si_item.cost_center, si_item.qty,
 			si_item.base_net_rate, si_item.base_net_amount, si.customer_name,
-			si.customer_group, si_item.so_detail, si.mode_of_payment
+			si.customer_group, si_item.so_detail, si.update_stock
 		from `tabSales Invoice` si, `tabSales Invoice Item` si_item
 		where si.name = si_item.parent and si.docstatus = 1 %s
 		order by si.posting_date desc, si_item.item_code desc""" % conditions, filters, as_dict=1)
--- a/erpnext/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.json
+++ b/erpnext/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.json
@@ -7,12 +7,12 @@
 "doctype": "Report", 
 "idx": 1, 
 "is_standard": "Yes", 
- "modified": "2016-05-17 08:26:50.810208", 
+ "modified": "2016-08-18 14:29:50.680329", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Ordered Items To Be Billed", 
 "owner": "Administrator", 
- "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`status` as \"Status\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order`.`project` as \"Project\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.base_amount as \"Amount:Currency:110\",\n (`tabSales Order Item`.billed_amt * ifnull(`tabSales Order`.conversion_rate, 1)) as \"Billed Amount:Currency:110\",\n (`tabSales Order Item`.base_amount - (`tabSales Order Item`.billed_amt * ifnull(`tabSales Order`.conversion_rate, 1))) as \"Pending Amount:Currency:120\",\n `tabSales Order Item`.item_name as \"Item Name::150\",\n `tabSales Order Item`.description as \"Description::200\",\n `tabSales Order`.`company` as \"Company:Link/Company:\"\nfrom\n `tabSales Order`, `tabSales Order Item`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and `tabSales Order`.status != \"Closed\"\n and `tabSales Order Item`.amount > 0\n and `tabSales Order Item`.billed_amt < `tabSales Order Item`.amount\norder by `tabSales Order`.transaction_date asc", 
+ "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n  `tabSales Order`.`customer_name` as \"Customer Name:150\",\n`tabSales Order`.`status` as \"Status\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order`.`project` as \"Project\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.base_amount as \"Amount:Currency:110\",\n (`tabSales Order Item`.billed_amt * ifnull(`tabSales Order`.conversion_rate, 1)) as \"Billed Amount:Currency:110\",\n (`tabSales Order Item`.base_amount - (`tabSales Order Item`.billed_amt * ifnull(`tabSales Order`.conversion_rate, 1))) as \"Pending Amount:Currency:120\",\n `tabSales Order Item`.item_name as \"Item Name::150\",\n `tabSales Order Item`.description as \"Description::200\",\n `tabSales Order`.`company` as \"Company:Link/Company:\"\nfrom\n `tabSales Order`, `tabSales Order Item`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and `tabSales Order`.status != \"Closed\"\n and `tabSales Order Item`.amount > 0\n and `tabSales Order Item`.billed_amt < `tabSales Order Item`.amount\norder by `tabSales Order`.transaction_date asc", 
 "ref_doctype": "Sales Invoice", 
 "report_name": "Ordered Items To Be Billed", 
 "report_type": "Query Report"
--- a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js
+++ b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js
@@ -46,8 +46,8 @@ frappe.query_reports["Payment Period Based On Invoice Date"] = {
 			"label": __("Party"),
 			"fieldtype": "Dynamic Link",
 			"get_options": function() {
-				var party_type = frappe.query_report.filters_by_name.party_type.get_value();
-				var party = frappe.query_report.filters_by_name.party.get_value();
+				var party_type = frappe.query_report_filters_by_name.party_type.get_value();
+				var party = frappe.query_report_filters_by_name.party.get_value();
 				if(party && !party_type) {
 					frappe.throw(__("Please select Party Type first"));
 				}
--- a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js
+++ b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js
@@ -5,9 +5,23 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() {
 	frappe.query_reports["Profit and Loss Statement"] = $.extend({},
 		erpnext.financial_statements);

-	frappe.query_reports["Profit and Loss Statement"]["filters"].push({
-		"fieldname": "accumulated_values",
-		"label": __("Accumulated Values"),
-		"fieldtype": "Check"
-	});
+	frappe.query_reports["Profit and Loss Statement"]["filters"].push(
+		{
+			"fieldname":"cost_center",
+			"label": __("Cost Center"),
+			"fieldtype": "Link",
+			"options": "Cost Center"
+		},
+		{
+			"fieldname":"project",
+			"label": __("Project"),
+			"fieldtype": "Link",
+			"options": "Project"
+		},
+		{
+			"fieldname": "accumulated_values",
+			"label": __("Accumulated Values"),
+			"fieldtype": "Check"
+		}
+	);
 });
--- a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
+++ b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
@@ -8,12 +8,12 @@ from frappe.utils import flt
 from erpnext.accounts.report.financial_statements import (get_period_list, get_columns, get_data)

 def execute(filters=None):
-	period_list = get_period_list(filters.fiscal_year, filters.periodicity)
+	period_list = get_period_list(filters.from_fiscal_year, filters.to_fiscal_year, filters.periodicity)
 	
-	income = get_data(filters.company, "Income", "Credit", period_list, 
-		accumulated_values=filters.accumulated_values, ignore_closing_entries=True)
-	expense = get_data(filters.company, "Expense", "Debit", period_list, 
-		accumulated_values=filters.accumulated_values, ignore_closing_entries=True)
+	income = get_data(filters.company, "Income", "Credit", period_list, filters = filters,
+		accumulated_values=filters.accumulated_values, ignore_closing_entries=True, ignore_accumulated_values_for_fy= True)
+	expense = get_data(filters.company, "Expense", "Debit", period_list, filters=filters,
+		accumulated_values=filters.accumulated_values, ignore_closing_entries=True, ignore_accumulated_values_for_fy= True)
 	
 	net_profit_loss = get_net_profit_loss(income, expense, period_list, filters.company)

@@ -34,7 +34,7 @@ def get_net_profit_loss(income, expense, period_list, company):
 		total = 0
 		net_profit_loss = {
 			"account_name": "'" + _("Net Profit / Loss") + "'",
-			"account": None,
+			"account": "'" + _("Net Profit / Loss") + "'",
 			"warn_if_negative": True,
 			"currency": frappe.db.get_value("Company", company, "default_currency")
 		}
@@ -54,7 +54,7 @@ def get_net_profit_loss(income, expense, period_list, company):
 			return net_profit_loss

 def get_chart_data(filters, columns, income, expense, net_profit_loss):
-	x_intervals = ['x'] + [d.get("label") for d in columns[2:-1]]
+	x_intervals = ['x'] + [d.get("label") for d in columns[2:]]
 	
 	income_data, expense_data, net_profit = [], [], []
 	
--- a/erpnext/accounts/report/profitability_analysis/init.py
+++ b/erpnext/accounts/report/profitability_analysis/init.py
--- a/erpnext/accounts/report/profitability_analysis/profitability_analysis.js
+++ b/erpnext/accounts/report/profitability_analysis/profitability_analysis.js
@@ -0,0 +1,106 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.require("assets/erpnext/js/financial_statements.js", function() {
+	frappe.query_reports["Profitability Analysis"] = {
+		"filters": [
+			{
+				"fieldname": "company",
+				"label": __("Company"),
+				"fieldtype": "Link",
+				"options": "Company",
+				"default": frappe.defaults.get_user_default("Company"),
+				"reqd": 1
+			},
+			{
+				"fieldname": "based_on",
+				"label": __("Based On"),
+				"fieldtype": "Select",
+				"options": "Cost Center\nProject",
+				"default": "Cost Center",
+				"reqd": 1
+			},
+			{
+				"fieldname": "fiscal_year",
+				"label": __("Fiscal Year"),
+				"fieldtype": "Link",
+				"options": "Fiscal Year",
+				"default": frappe.defaults.get_user_default("fiscal_year"),
+				"reqd": 1,
+				"on_change": function(query_report) {
+					var fiscal_year = query_report.get_values().fiscal_year;
+					if (!fiscal_year) {
+						return;
+					}
+					frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) {
+						var fy = frappe.model.get_doc("Fiscal Year", fiscal_year);
+						frappe.query_report_filters_by_name.from_date.set_input(fy.year_start_date);
+						frappe.query_report_filters_by_name.to_date.set_input(fy.year_end_date);
+						query_report.trigger_refresh();
+					});
+				}
+			},
+			{
+				"fieldname": "from_date",
+				"label": __("From Date"),
+				"fieldtype": "Date",
+				"default": frappe.defaults.get_user_default("year_start_date"),
+			},
+			{
+				"fieldname": "to_date",
+				"label": __("To Date"),
+				"fieldtype": "Date",
+				"default": frappe.defaults.get_user_default("year_end_date"),
+			},
+			{
+				"fieldname": "show_zero_values",
+				"label": __("Show zero values"),
+				"fieldtype": "Check"
+			}
+		],
+		"formatter": function(row, cell, value, columnDef, dataContext, default_formatter) {
+			if (columnDef.df.fieldname=="account") {
+				value = dataContext.account_name;
+
+				columnDef.df.link_onclick =
+					"frappe.query_reports['Profitability Analysis'].open_profit_and_loss_statement(" + JSON.stringify(dataContext) + ")";
+				columnDef.df.is_tree = true;
+			}
+
+			value = default_formatter(row, cell, value, columnDef, dataContext);
+
+			if (!dataContext.parent_account && dataContext.based_on != 'project') {
+				var $value = $(value).css("font-weight", "bold");
+				if (dataContext.warn_if_negative && dataContext[columnDef.df.fieldname] < 0) {
+					$value.addClass("text-danger");
+				}
+
+				value = $value.wrap("<p></p>").parent().html();
+			}
+
+			return value;
+		},
+		"open_profit_and_loss_statement": function(data) {
+			if (!data.account) return;
+
+			frappe.route_options = {
+				"company": frappe.query_report_filters_by_name.company.get_value(),
+				"from_fiscal_year": data.fiscal_year,
+				"to_fiscal_year": data.fiscal_year
+			};
+
+			if(data.based_on == 'cost_center'){
+				frappe.route_options["cost_center"] = data.account
+			} else {
+				frappe.route_options["project"] = data.account
+			}
+
+			frappe.set_route("query-report", "Profit and Loss Statement");
+		},
+		"tree": true,
+		"name_field": "account",
+		"parent_field": "parent_account",
+		"initial_depth": 3
+	}
+});
+
--- a/erpnext/accounts/report/profitability_analysis/profitability_analysis.json
+++ b/erpnext/accounts/report/profitability_analysis/profitability_analysis.json
@@ -0,0 +1,18 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2016-08-24 05:47:09.931202", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "modified": "2016-08-24 05:47:09.931202", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Profitability Analysis", 
+ "owner": "Administrator", 
+ "ref_doctype": "GL Entry", 
+ "report_name": "Profitability Analysis", 
+ "report_type": "Script Report"
+}
--- a/erpnext/accounts/report/profitability_analysis/profitability_analysis.py
+++ b/erpnext/accounts/report/profitability_analysis/profitability_analysis.py
@@ -0,0 +1,188 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.utils import flt, getdate, formatdate, cstr
+from erpnext.accounts.report.financial_statements import filter_accounts, filter_out_zero_value_rows
+from erpnext.accounts.report.trial_balance.trial_balance import validate_filters
+
+value_fields = ("income", "expense", "gross_profit_loss")
+
+def execute(filters=None):
+	based_on = filters.based_on.replace(' ', '_').lower()
+	validate_filters(filters)
+	accounts = get_accounts_data(based_on, filters.company)
+	data = get_data(accounts, filters, based_on)
+	columns = get_columns(filters)
+	return columns, data
+
+def get_accounts_data(based_on, company):
+	if based_on == 'cost_center':
+		return frappe.db.sql("""select name, parent_cost_center as parent_account, cost_center_name as account_name, lft, rgt
+			from `tabCost Center` where company=%s order by lft""", company, as_dict=True)
+	else:
+		return frappe.get_all('Project', fields = ["name"], filters = {'company': company})
+
+def get_data(accounts, filters, based_on):
+	if not accounts:
+		return None
+
+	accounts, accounts_by_name, parent_children_map = filter_accounts(accounts)
+
+	gl_entries_by_account = {}
+
+	set_gl_entries_by_account(filters.company, filters.from_date,
+		filters.to_date, based_on, gl_entries_by_account, ignore_closing_entries=not flt(filters.with_period_closing_entry))
+
+	total_row = calculate_values(accounts, gl_entries_by_account, filters)
+	accumulate_values_into_parents(accounts, accounts_by_name)
+
+	data = prepare_data(accounts, filters, total_row, parent_children_map, based_on)
+	data = filter_out_zero_value_rows(data, parent_children_map, 
+		show_zero_values=filters.get("show_zero_values"))
+
+	return data
+
+def calculate_values(accounts, gl_entries_by_account, filters):
+	init = {
+		"income": 0.0,
+		"expense": 0.0,
+		"gross_profit_loss": 0.0
+	}
+
+	total_row = {
+		"cost_center": None,
+		"account_name": "'" + _("Total") + "'",
+		"warn_if_negative": True,
+		"income": 0.0,
+		"expense": 0.0,
+		"gross_profit_loss": 0.0
+	}
+
+	for d in accounts:
+		d.update(init.copy())
+
+		# add opening
+
+		for entry in gl_entries_by_account.get(d.name, []):
+			if cstr(entry.is_opening) != "Yes":
+				if entry.type == 'Income':
+					d["income"] += flt(entry.credit) - flt(entry.debit)
+				if entry.type == 'Expense':
+					d["expense"] += flt(entry.debit) - flt(entry.credit)
+
+				d["gross_profit_loss"] = d.get("income") - d.get("expense")
+
+		total_row["income"] += d["income"]
+		total_row["expense"] += d["expense"]
+
+	total_row["gross_profit_loss"] = total_row.get("income") - total_row.get("expense")
+
+	return total_row
+
+def accumulate_values_into_parents(accounts, accounts_by_name):
+	for d in reversed(accounts):
+		if d.parent_account:
+			for key in value_fields:
+				accounts_by_name[d.parent_account][key] += d[key]
+
+def prepare_data(accounts, filters, total_row, parent_children_map, based_on):
+	data = []
+	company_currency = frappe.db.get_value("Company", filters.company, "default_currency")
+
+	for d in accounts:
+		has_value = False
+		row = {
+			"account_name": d.account_name or d.name,
+			"account": d.name,
+			"parent_account": d.parent_account,
+			"indent": d.indent,
+			"fiscal_year": filters.fiscal_year,
+			"currency": company_currency,
+			"based_on": based_on
+		}
+
+		for key in value_fields:
+			row[key] = flt(d.get(key, 0.0), 3)
+			
+			if abs(row[key]) >= 0.005:
+				# ignore zero values
+				has_value = True
+
+		row["has_value"] = has_value
+		data.append(row)
+		
+	data.extend([{},total_row])
+
+	return data
+
+def get_columns(filters):
+	return [
+		{
+			"fieldname": "account",
+			"label": _(filters.based_on),
+			"fieldtype": "Link",
+			"options": filters.based_on,
+			"width": 300
+		},
+		{
+			"fieldname": "income",
+			"label": _("Income"),
+			"fieldtype": "Currency",
+			"options": "currency",
+			"width": 120
+		},
+		{
+			"fieldname": "expense",
+			"label": _("Expense"),
+			"fieldtype": "Currency",
+			"options": "currency",
+			"width": 120
+		},
+		{
+			"fieldname": "gross_profit_loss",
+			"label": _("Gross Profit / Loss"),
+			"fieldtype": "Currency",
+			"options": "currency",
+			"width": 120
+		},
+		{
+			"fieldname": "currency",
+			"label": _("Currency"),
+			"fieldtype": "Link",
+			"options": "Currency",
+			"hidden": 1
+		}
+	]
+
+def set_gl_entries_by_account(company, from_date, to_date, based_on, gl_entries_by_account,
+		ignore_closing_entries=False):
+	"""Returns a dict like { "account": [gl entries], ... }"""
+	additional_conditions = []
+
+	if ignore_closing_entries:
+		additional_conditions.append("and ifnull(voucher_type, '')!='Period Closing Voucher'")
+
+	if from_date:
+		additional_conditions.append("and posting_date >= %(from_date)s")
+
+	gl_entries = frappe.db.sql("""select posting_date, {based_on} as based_on, debit, credit, 
+		is_opening, (select root_type from `tabAccount` where name = account) as type
+		from `tabGL Entry` where company=%(company)s
+		{additional_conditions}
+		and posting_date <= %(to_date)s
+		and {based_on} is not null
+		order by {based_on}, posting_date""".format(additional_conditions="\n".join(additional_conditions), based_on= based_on),
+		{
+			"company": company,
+			"from_date": from_date,
+			"to_date": to_date
+		},
+		as_dict=True)
+
+	for entry in gl_entries:
+		gl_entries_by_account.setdefault(entry.based_on, []).append(entry)
+
+	return gl_entries_by_account
--- a/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.json
+++ b/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.json
@@ -7,12 +7,12 @@
 "doctype": "Report", 
 "idx": 1, 
 "is_standard": "Yes", 
- "modified": "2016-05-17 08:28:26.093139", 
+ "modified": "2016-08-18 15:46:45.789536", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Purchase Order Items To Be Billed", 
 "owner": "Administrator", 
- "query": "select \n    `tabPurchase Order`.`name` as \"Purchase Order:Link/Purchase Order:120\",\n    `tabPurchase Order`.`transaction_date` as \"Date:Date:100\",\n\t`tabPurchase Order`.`supplier` as \"Supplier:Link/Supplier:120\",\n\t`tabPurchase Order Item`.`project` as \"Project\",\n\t`tabPurchase Order Item`.item_code as \"Item Code:Link/Item:120\",\n\t`tabPurchase Order Item`.base_amount as \"Amount:Currency:100\",\n\t(`tabPurchase Order Item`.billed_amt * ifnull(`tabPurchase Order`.conversion_rate, 1)) as \"Billed Amount:Currency:100\", \n\t(`tabPurchase Order Item`.base_amount - (`tabPurchase Order Item`.billed_amt * ifnull(`tabPurchase Order`.conversion_rate, 1))) as \"Amount to Bill:Currency:100\",\n\t`tabPurchase Order Item`.item_name as \"Item Name::150\",\n\t`tabPurchase Order Item`.description as \"Description::200\",\n\t`tabPurchase Order`.company as \"Company:Link/Company:\"\nfrom\n\t`tabPurchase Order`, `tabPurchase Order Item`\nwhere\n\t`tabPurchase Order Item`.`parent` = `tabPurchase Order`.`name`\n\tand `tabPurchase Order`.docstatus = 1\n\tand `tabPurchase Order`.status != \"Closed\"\n        and `tabPurchase Order Item`.amount > 0\n\tand (`tabPurchase Order Item`.billed_amt * ifnull(`tabPurchase Order`.conversion_rate, 1)) < `tabPurchase Order Item`.base_amount\norder by `tabPurchase Order`.transaction_date asc", 
+ "query": "select \n    `tabPurchase Order`.`name` as \"Purchase Order:Link/Purchase Order:120\",\n    `tabPurchase Order`.`transaction_date` as \"Date:Date:100\",\n\t`tabPurchase Order`.`supplier` as \"Supplier:Link/Supplier:120\",\n\t`tabPurchase Order`.`supplier_name` as \"Supplier Name::150\",\n\t`tabPurchase Order Item`.`project` as \"Project\",\n\t`tabPurchase Order Item`.item_code as \"Item Code:Link/Item:120\",\n\t`tabPurchase Order Item`.base_amount as \"Amount:Currency:100\",\n\t(`tabPurchase Order Item`.billed_amt * ifnull(`tabPurchase Order`.conversion_rate, 1)) as \"Billed Amount:Currency:100\", \n\t(`tabPurchase Order Item`.base_amount - (`tabPurchase Order Item`.billed_amt * ifnull(`tabPurchase Order`.conversion_rate, 1))) as \"Amount to Bill:Currency:100\",\n\t`tabPurchase Order Item`.item_name as \"Item Name::150\",\n\t`tabPurchase Order Item`.description as \"Description::200\",\n\t`tabPurchase Order`.company as \"Company:Link/Company:\"\nfrom\n\t`tabPurchase Order`, `tabPurchase Order Item`\nwhere\n\t`tabPurchase Order Item`.`parent` = `tabPurchase Order`.`name`\n\tand `tabPurchase Order`.docstatus = 1\n\tand `tabPurchase Order`.status != \"Closed\"\n        and `tabPurchase Order Item`.amount > 0\n\tand (`tabPurchase Order Item`.billed_amt * ifnull(`tabPurchase Order`.conversion_rate, 1)) < `tabPurchase Order Item`.base_amount\norder by `tabPurchase Order`.transaction_date asc", 
 "ref_doctype": "Purchase Invoice", 
 "report_name": "Purchase Order Items To Be Billed", 
 "report_type": "Query Report"
--- a/erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.json
+++ b/erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.json
@@ -7,12 +7,12 @@
 "doctype": "Report", 
 "idx": 1, 
 "is_standard": "Yes", 
- "modified": "2016-05-17 08:38:49.654749", 
+ "modified": "2016-08-18 14:32:20.965816", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Received Items To Be Billed", 
 "owner": "Administrator", 
- "query": "select\n    `tabPurchase Receipt`.`name` as \"Purchase Receipt:Link/Purchase Receipt:120\",\n    `tabPurchase Receipt`.`supplier` as \"Supplier:Link/Supplier:120\",\n\t`tabPurchase Receipt`.`posting_date` as \"Date:Date\",\n\t`tabPurchase Receipt Item`.`project` as \"Project\",\n\t`tabPurchase Receipt Item`.`item_code` as \"Item:Link/Item:120\",\n\t(`tabPurchase Receipt Item`.`base_amount` - `tabPurchase Receipt Item`.`billed_amt`*ifnull(`tabPurchase Receipt`.conversion_rate, 1)) as \"Pending Amount:Currency:110\",\n\t`tabPurchase Receipt Item`.`item_name` as \"Item Name::150\",\n\t`tabPurchase Receipt Item`.`description` as \"Description::200\",\n\t`tabPurchase Receipt`.`company` as \"Company:Link/Company:\"\nfrom `tabPurchase Receipt`, `tabPurchase Receipt Item`\nwhere\n    `tabPurchase Receipt`.name = `tabPurchase Receipt Item`.parent \n    and `tabPurchase Receipt`.docstatus = 1 \n    and `tabPurchase Receipt`.status != \"Closed\" \n    and `tabPurchase Receipt Item`.amount > 0\n    and `tabPurchase Receipt Item`.billed_amt < `tabPurchase Receipt Item`.amount\norder by `tabPurchase Receipt`.`name` desc", 
+ "query": "select\n    `tabPurchase Receipt`.`name` as \"Purchase Receipt:Link/Purchase Receipt:120\",\n    `tabPurchase Receipt`.`supplier` as \"Supplier:Link/Supplier:120\",\n\t`tabPurchase Receipt`.`supplier_name` as \"Supplier Name::150\",\n\t`tabPurchase Receipt`.`posting_date` as \"Date:Date\",\n\t`tabPurchase Receipt Item`.`project` as \"Project\",\n\t`tabPurchase Receipt Item`.`item_code` as \"Item:Link/Item:120\",\n\t(`tabPurchase Receipt Item`.`base_amount` - `tabPurchase Receipt Item`.`billed_amt`*ifnull(`tabPurchase Receipt`.conversion_rate, 1)) as \"Pending Amount:Currency:110\",\n\t`tabPurchase Receipt Item`.`item_name` as \"Item Name::150\",\n\t`tabPurchase Receipt Item`.`description` as \"Description::200\",\n\t`tabPurchase Receipt`.`company` as \"Company:Link/Company:\"\nfrom `tabPurchase Receipt`, `tabPurchase Receipt Item`\nwhere\n    `tabPurchase Receipt`.name = `tabPurchase Receipt Item`.parent \n    and `tabPurchase Receipt`.docstatus = 1 \n    and `tabPurchase Receipt`.status != \"Closed\" \n    and `tabPurchase Receipt Item`.amount > 0\n    and `tabPurchase Receipt Item`.billed_amt < `tabPurchase Receipt Item`.amount\norder by `tabPurchase Receipt`.`name` desc", 
 "ref_doctype": "Purchase Invoice", 
 "report_name": "Received Items To Be Billed", 
 "report_type": "Query Report"
--- a/erpnext/accounts/report/sales_register/sales_register.py
+++ b/erpnext/accounts/report/sales_register/sales_register.py
@@ -23,6 +23,7 @@ def execute(filters=None):
 	invoice_so_dn_map = get_invoice_so_dn_map(invoice_list)
 	customer_map = get_customer_deatils(invoice_list)
 	company_currency = frappe.db.get_value("Company", filters.company, "default_currency")
+	mode_of_payments = get_mode_of_payments([inv.name for inv in invoice_list])

 	data = []
 	for inv in invoice_list:
@@ -33,7 +34,7 @@ def execute(filters=None):
 		row = [inv.name, inv.posting_date, inv.customer, inv.customer_name,
 		customer_map.get(inv.customer, {}).get("customer_group"), 
 		customer_map.get(inv.customer, {}).get("territory"),
-		inv.debit_to, inv.mode_of_payment, inv.project, inv.remarks, 
+		inv.debit_to, ", ".join(mode_of_payments.get(inv.name, [])), inv.project, inv.remarks, 
 		", ".join(sales_order), ", ".join(delivery_note), company_currency]

 		# map income values
@@ -68,7 +69,7 @@ def get_columns(invoice_list):
 		_("Invoice") + ":Link/Sales Invoice:120", _("Posting Date") + ":Date:80", 
 		_("Customer Id") + "::120", _("Customer Name") + "::120", 
 		_("Customer Group") + ":Link/Customer Group:120", _("Territory") + ":Link/Territory:80", 
-		_("Receivable Account") + ":Link/Account:120", _("Mode of Payment") + ":Link/Mode of Payment:80", 
+		_("Receivable Account") + ":Link/Account:120", _("Mode of Payment") + "::120", 
 		_("Project") +":Link/Project:80", _("Remarks") + "::150", 
 		_("Sales Order") + ":Link/Sales Order:100", _("Delivery Note") + ":Link/Delivery Note:100",
 		{
@@ -113,14 +114,17 @@ def get_conditions(filters):
 	if filters.get("from_date"): conditions += " and posting_date >= %(from_date)s"
 	if filters.get("to_date"): conditions += " and posting_date <= %(to_date)s"
 	
-	if filters.get("mode_of_payment"): conditions += " and ifnull(mode_of_payment, '') = %(mode_of_payment)s"
-
+	if filters.get("mode_of_payment"):
+		conditions += """ and exists(select name from `tabSales Invoice Payment`
+			 where parent=`tabSales Invoice`.name 
+			 	and ifnull(`tabSales Invoice Payment`.mode_of_payment, '') = %(mode_of_payment)s)"""
+				
 	return conditions

 def get_invoices(filters):
 	conditions = get_conditions(filters)
 	return frappe.db.sql("""select name, posting_date, debit_to, project, customer, customer_name, remarks, 
-		base_net_total, base_grand_total, base_rounded_total, outstanding_amount, mode_of_payment
+		base_net_total, base_grand_total, base_rounded_total, outstanding_amount
 		from `tabSales Invoice`
 		where docstatus = 1 %s order by posting_date desc, name desc""" %
 		conditions, filters, as_dict=1)
@@ -188,3 +192,16 @@ def get_customer_deatils(invoice_list):
 			customer_map.setdefault(cust.name, cust)

 	return customer_map
+
+
+def get_mode_of_payments(invoice_list):
+	mode_of_payments = {}
+	if invoice_list:
+		inv_mop = frappe.db.sql("""select parent, mode_of_payment
+			from `tabSales Invoice Payment` where parent in (%s) group by parent, mode_of_payment""" %
+			', '.join(['%s']*len(invoice_list)), tuple(invoice_list), as_dict=1)
+
+		for d in inv_mop:
+			mode_of_payments.setdefault(d.parent, []).append(d.mode_of_payment)
+
+	return mode_of_payments
--- a/erpnext/accounts/report/trial_balance/trial_balance.js
+++ b/erpnext/accounts/report/trial_balance/trial_balance.js
@@ -26,8 +26,8 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() {
 					}
 					frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) {
 						var fy = frappe.model.get_doc("Fiscal Year", fiscal_year);
-						query_report.filters_by_name.from_date.set_input(fy.year_start_date);
-						query_report.filters_by_name.to_date.set_input(fy.year_end_date);
+						frappe.query_report_filters_by_name.from_date.set_input(fy.year_start_date);
+						frappe.query_report_filters_by_name.to_date.set_input(fy.year_end_date);
 						query_report.trigger_refresh();
 					});
 				}
@@ -55,6 +55,11 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() {
 				"label": __("Show zero values"),
 				"fieldtype": "Check"
 			},
+			{
+				"fieldname": "show_unclosed_fy_pl_balances",
+				"label": __("Show unclosed fiscal year's P&L balances"),
+				"fieldtype": "Check"
+			}
 		],
 		"formatter": erpnext.financial_statements.formatter,
 		"tree": true,
--- a/erpnext/accounts/report/trial_balance/trial_balance.py
+++ b/erpnext/accounts/report/trial_balance/trial_balance.py
@@ -65,7 +65,7 @@ def get_data(filters):
 	gl_entries_by_account = {}

 	set_gl_entries_by_account(filters.company, filters.from_date,
-		filters.to_date, min_lft, max_rgt, gl_entries_by_account, ignore_closing_entries=not flt(filters.with_period_closing_entry))
+		filters.to_date, min_lft, max_rgt, filters, gl_entries_by_account, ignore_closing_entries=not flt(filters.with_period_closing_entry))

 	opening_balances = get_opening_balances(filters)

@@ -87,8 +87,10 @@ def get_opening_balances(filters):


 def get_rootwise_opening_balances(filters, report_type):
-	additional_conditions = " and posting_date >= %(year_start_date)s" \
-		if report_type == "Profit and Loss" else ""
+	additional_conditions = ""
+	if not filters.show_unclosed_fy_pl_balances:
+		additional_conditions = " and posting_date >= %(year_start_date)s" \
+			if report_type == "Profit and Loss" else ""

 	if not flt(filters.with_period_closing_entry):
 		additional_conditions += " and ifnull(voucher_type, '')!='Period Closing Voucher'"
--- a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
+++ b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
@@ -25,8 +25,8 @@ frappe.query_reports["Trial Balance for Party"] = {
 				}
 				frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) {
 					var fy = frappe.model.get_doc("Fiscal Year", fiscal_year);
-					query_report.filters_by_name.from_date.set_input(fy.year_start_date);
-					query_report.filters_by_name.to_date.set_input(fy.year_end_date);
+					frappe.query_report_filters_by_name.from_date.set_input(fy.year_start_date);
+					frappe.query_report_filters_by_name.to_date.set_input(fy.year_end_date);
 					query_report.trigger_refresh();
 				});
 			}
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -127,6 +127,83 @@ def get_balance_on(account=None, date=None, party_type=None, party=None, company
 		# if bal is None, return 0
 		return flt(bal)

+def get_count_on(account, fieldname, date):
+
+	cond = []
+	if date:
+		cond.append("posting_date <= '%s'" % frappe.db.escape(cstr(date)))
+	else:
+		# get balance of all entries that exist
+		date = nowdate()
+
+	try:
+		year_start_date = get_fiscal_year(date, verbose=0)[1]
+	except FiscalYearError:
+		if getdate(date) > getdate(nowdate()):
+			# if fiscal year not found and the date is greater than today
+			# get fiscal year for today's date and its corresponding year start date
+			year_start_date = get_fiscal_year(nowdate(), verbose=1)[1]
+		else:
+			# this indicates that it is a date older than any existing fiscal year.
+			# hence, assuming balance as 0.0
+			return 0.0
+
+	if account:
+		acc = frappe.get_doc("Account", account)
+
+		if not frappe.flags.ignore_account_permission:
+			acc.check_permission("read")
+
+		# for pl accounts, get balance within a fiscal year
+		if acc.report_type == 'Profit and Loss':
+			cond.append("posting_date >= '%s' and voucher_type != 'Period Closing Voucher'" \
+				% year_start_date)
+
+		# different filter for group and ledger - improved performance
+		if acc.is_group:
+			cond.append("""exists (
+				select name from `tabAccount` ac where ac.name = gle.account
+				and ac.lft >= %s and ac.rgt <= %s
+			)""" % (acc.lft, acc.rgt))
+
+			# If group and currency same as company,
+			# always return balance based on debit and credit in company currency
+			if acc.account_currency == frappe.db.get_value("Company", acc.company, "default_currency"):
+				in_account_currency = False
+		else:
+			cond.append("""gle.account = "%s" """ % (frappe.db.escape(account, percent=False), ))
+
+		entries = frappe.db.sql("""
+			SELECT name, posting_date, account, party_type, party,debit,credit,
+				voucher_type, voucher_no, against_voucher_type, against_voucher
+			FROM `tabGL Entry` gle
+			WHERE {0}""".format(" and ".join(cond)), as_dict=True)
+		
+		count = 0
+		for gle in entries:
+			if fieldname not in ('invoiced_amount','payables'):
+				count += 1
+			else:
+				dr_or_cr = "debit" if fieldname == "invoiced_amount" else "credit"
+				cr_or_dr = "credit" if fieldname == "invoiced_amount" else "debit"
+				select_fields = "ifnull(sum(credit-debit),0)" if fieldname == "invoiced_amount" else "ifnull(sum(debit-credit),0)"
+
+				if ((not gle.against_voucher) or (gle.against_voucher_type in ["Sales Order", "Purchase Order"]) or
+				(gle.against_voucher==gle.voucher_no and gle.get(dr_or_cr) > 0)):
+					payment_amount = frappe.db.sql("""
+						SELECT {0}
+						FROM `tabGL Entry` gle
+						WHERE docstatus < 2 and posting_date <= %(date)s and against_voucher = %(voucher_no)s
+						and party = %(party)s and name != %(name)s""".format(select_fields),
+						{"date": date, "voucher_no": gle.voucher_no, "party": gle.party, "name": gle.name})[0][0]
+					
+					outstanding_amount = flt(gle.get(dr_or_cr)) - flt(gle.get(cr_or_dr)) - payment_amount
+					currency_precision = get_currency_precision() or 2
+					if abs(flt(outstanding_amount)) > 0.1/10**currency_precision:
+						count += 1
+					
+		return count
+
@frappe.whitelist()
 def add_ac(args=None):
 	if not args:
@@ -570,3 +647,58 @@ def get_children():
 				each["balance_in_account_currency"] = flt(get_balance_on(each.get("value")))

 	return acc
+
+def create_payment_gateway_and_account(gateway):
+	create_payment_gateway(gateway)
+	create_payment_gateway_account(gateway)
+
+def create_payment_gateway(gateway):
+	# NOTE: we don't translate Payment Gateway name because it is an internal doctype
+	if not frappe.db.exists("Payment Gateway", gateway):
+		payment_gateway = frappe.get_doc({
+			"doctype": "Payment Gateway",
+			"gateway": gateway
+		})
+		payment_gateway.insert(ignore_permissions=True)
+
+def create_payment_gateway_account(gateway):
+	from erpnext.setup.setup_wizard.setup_wizard import create_bank_account
+
+	company = frappe.db.get_value("Global Defaults", None, "default_company")
+	if not company:
+		return
+
+	# NOTE: we translate Payment Gateway account name because that is going to be used by the end user
+	bank_account = frappe.db.get_value("Account", {"account_name": _(gateway), "company": company},
+		["name", 'account_currency'], as_dict=1)
+
+	if not bank_account:
+		# check for untranslated one
+		bank_account = frappe.db.get_value("Account", {"account_name": gateway, "company": company},
+			["name", 'account_currency'], as_dict=1)
+
+	if not bank_account:
+		# try creating one
+		bank_account = create_bank_account({"company_name": company, "bank_account": _(gateway)})
+
+	if not bank_account:
+		frappe.msgprint(_("Payment Gateway Account not created, please create one manually."))
+		return
+
+	# if payment gateway account exists, return
+	if frappe.db.exists("Payment Gateway Account",
+		{"payment_gateway": gateway, "currency": bank_account.account_currency}):
+		return
+
+	try:
+		frappe.get_doc({
+			"doctype": "Payment Gateway Account",
+			"is_default": 1,
+			"payment_gateway": gateway,
+			"payment_account": bank_account.name,
+			"currency": bank_account.account_currency
+		}).insert(ignore_permissions=True)
+
+	except frappe.DuplicateEntryError:
+		# already exists, due to a reinstall?
+		pass
--- a/erpnext/buying/doctype/purchase_common/purchase_common.js
+++ b/erpnext/buying/doctype/purchase_common/purchase_common.js
@@ -12,14 +12,6 @@ cur_frm.email_field = "contact_email";
 erpnext.buying.BuyingController = erpnext.TransactionController.extend({
 	setup: function() {
 		this._super();
-		if(!in_list(["Material Request", "Request for Quotation"], this.frm.doc.doctype)){
-			this.frm.get_field('items').grid.editable_fields = [
-				{fieldname: 'item_code', columns: 3},
-				{fieldname: 'qty', columns: 2},
-				{fieldname: 'rate', columns: 3},
-				{fieldname: 'amount', columns: 2}
-			];
-		}
 	},

 	onload: function() {
@@ -146,20 +138,15 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
 	},

 	qty: function(doc, cdt, cdn) {
+		var item = frappe.get_doc(cdt, cdn);
 		if ((doc.doctype == "Purchase Receipt") || (doc.doctype == "Purchase Invoice" && doc.update_stock)) {
-			var item = frappe.get_doc(cdt, cdn);
 			frappe.model.round_floats_in(item, ["qty", "received_qty"]);
 			if(!(item.received_qty || item.rejected_qty) && item.qty) {
 				item.received_qty = item.qty;
 			}

-			if(item.qty > item.received_qty) {
-				msgprint(__("Error: {0} > {1}", [__(frappe.meta.get_label(item.doctype, "qty", item.name)),
-							__(frappe.meta.get_label(item.doctype, "received_qty", item.name))]))
-				item.qty = item.rejected_qty = 0.0;
-			} else {
-				item.rejected_qty = flt(item.received_qty - item.qty, precision("rejected_qty", item));
-			}
+			frappe.model.round_floats_in(item, ["qty", "received_qty"]);
+			item.rejected_qty = flt(item.received_qty - item.qty, precision("rejected_qty", item));
 		}

 		this._super(doc, cdt, cdn);
@@ -168,26 +155,18 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
 	},

 	received_qty: function(doc, cdt, cdn) {
-		var item = frappe.get_doc(cdt, cdn);
-		frappe.model.round_floats_in(item, ["qty", "received_qty"]);
-
-		item.qty = (item.qty < item.received_qty) ? item.qty : item.received_qty;
-		this.qty(doc, cdt, cdn);
+		this.calculate_accepted_qty(doc, cdt, cdn)
 	},

 	rejected_qty: function(doc, cdt, cdn) {
+		this.calculate_accepted_qty(doc, cdt, cdn)
+	},
+
+	calculate_accepted_qty: function(doc, cdt, cdn){
 		var item = frappe.get_doc(cdt, cdn);
 		frappe.model.round_floats_in(item, ["received_qty", "rejected_qty"]);

-		if(item.rejected_qty > item.received_qty) {
-			msgprint(__("Error: {0} > {1}", [__(frappe.meta.get_label(item.doctype, "rejected_qty", item.name)),
-						__(frappe.meta.get_label(item.doctype, "received_qty", item.name))]));
-			item.qty = item.rejected_qty = 0.0;
-		} else {
-
-			item.qty = flt(item.received_qty - item.rejected_qty, precision("qty", item));
-		}
-
+		item.qty = flt(item.received_qty - item.rejected_qty, precision("qty", item));
 		this.qty(doc, cdt, cdn);
 	},

@@ -204,7 +183,7 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
 		var item = frappe.get_doc(cdt, cdn);
 		if(item.item_code && item.warehouse) {
 			return this.frm.call({
-				method: "erpnext.stock.get_item_details.get_projected_qty",
+				method: "erpnext.stock.get_item_details.get_bin_details",
 				child: item,
 				args: {
 					item_code: item.item_code,
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.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": "supplier_section", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -39,6 +41,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "{supplier_name}", 
   "fieldname": "title", 
   "fieldtype": "Data", 
@@ -65,6 +68,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "naming_series", 
   "fieldtype": "Select", 
   "hidden": 0, 
@@ -92,6 +96,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "", 
   "fieldname": "supplier", 
   "fieldtype": "Link", 
@@ -120,6 +125,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.supplier && doc.docstatus===0 && (!(doc.items && doc.items.length) || (doc.items.length==1 && !doc.items[0].item_code))", 
   "fieldname": "get_items_from_open_material_requests", 
   "fieldtype": "Button", 
@@ -146,6 +152,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "No", 
   "fieldname": "is_subcontracted", 
   "fieldtype": "Select", 
@@ -172,6 +179,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "supplier_name", 
   "fieldtype": "Data", 
   "hidden": 0, 
@@ -196,6 +204,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -222,6 +231,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "Today", 
   "fieldname": "transaction_date", 
   "fieldtype": "Date", 
@@ -249,6 +259,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "amended_from", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -276,6 +287,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "", 
   "fieldname": "company", 
   "fieldtype": "Link", 
@@ -305,6 +317,7 @@
   "bold": 0, 
   "collapsible": 0, 
   "collapsible_depends_on": "", 
+   "columns": 0, 
   "fieldname": "drop_ship", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -330,6 +343,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "", 
   "fieldname": "customer", 
   "fieldtype": "Link", 
@@ -357,6 +371,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "", 
   "fieldname": "customer_name", 
   "fieldtype": "Data", 
@@ -383,6 +398,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_19", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -407,6 +423,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "", 
   "fieldname": "customer_contact_person", 
   "fieldtype": "Link", 
@@ -434,6 +451,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "customer_contact_display", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
@@ -459,6 +477,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "customer_contact_mobile", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
@@ -484,6 +503,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "customer_contact_email", 
   "fieldtype": "Code", 
   "hidden": 1, 
@@ -510,6 +530,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "section_addresses", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -535,6 +556,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "supplier_address", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -560,6 +582,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "contact_person", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -585,6 +608,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "", 
   "fieldname": "address_display", 
   "fieldtype": "Small Text", 
@@ -610,6 +634,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "contact_display", 
   "fieldtype": "Small Text", 
   "hidden": 0, 
@@ -634,6 +659,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "contact_mobile", 
   "fieldtype": "Small Text", 
   "hidden": 0, 
@@ -658,6 +684,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "contact_email", 
   "fieldtype": "Small Text", 
   "hidden": 0, 
@@ -682,6 +709,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "col_break_address", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -706,6 +734,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "", 
   "fieldname": "shipping_address", 
   "fieldtype": "Link", 
@@ -733,6 +762,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "shipping_address_display", 
   "fieldtype": "Small Text", 
   "hidden": 0, 
@@ -758,6 +788,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "currency_and_price_list", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -783,6 +814,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "currency", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -810,6 +842,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "", 
   "fieldname": "conversion_rate", 
   "fieldtype": "Float", 
@@ -838,6 +871,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "cb_price_list", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -861,6 +895,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "buying_price_list", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -886,6 +921,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "price_list_currency", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -911,6 +947,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "plc_conversion_rate", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -936,6 +973,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "ignore_pricing_rule", 
   "fieldtype": "Check", 
   "hidden": 0, 
@@ -960,6 +998,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "items_section", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -986,6 +1025,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "items", 
   "fieldtype": "Table", 
   "hidden": 0, 
@@ -1013,6 +1053,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.docstatus===0 && (doc.items && doc.items.length)", 
   "fieldname": "get_last_purchase_rate", 
   "fieldtype": "Button", 
@@ -1039,6 +1080,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "sb_last_purchase", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1062,6 +1104,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_total", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1088,6 +1131,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_net_total", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1115,6 +1159,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_26", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -1138,6 +1183,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "total", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1164,6 +1210,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "net_total", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1191,6 +1238,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "taxes_section", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1217,6 +1265,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "", 
   "fieldname": "taxes_and_charges", 
   "fieldtype": "Link", 
@@ -1245,6 +1294,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "taxes", 
   "fieldtype": "Table", 
   "hidden": 0, 
@@ -1272,6 +1322,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "other_charges_calculation", 
   "fieldtype": "HTML", 
   "hidden": 0, 
@@ -1297,6 +1348,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "totals", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1323,6 +1375,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_taxes_and_charges_added", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1350,6 +1403,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_taxes_and_charges_deducted", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1377,6 +1431,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_total_taxes_and_charges", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1404,6 +1459,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_39", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -1428,6 +1484,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "taxes_and_charges_added", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1455,6 +1512,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "taxes_and_charges_deducted", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1482,6 +1540,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "total_taxes_and_charges", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1509,6 +1568,7 @@
   "bold": 0, 
   "collapsible": 1, 
   "collapsible_depends_on": "discount_amount", 
+   "columns": 0, 
   "fieldname": "discount_section", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1534,6 +1594,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "Grand Total", 
   "fieldname": "apply_discount_on", 
   "fieldtype": "Select", 
@@ -1561,6 +1622,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_discount_amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1587,6 +1649,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_45", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -1611,6 +1674,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "additional_discount_percentage", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -1636,6 +1700,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "discount_amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1662,6 +1727,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "totals_section", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1686,6 +1752,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_grand_total", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1713,6 +1780,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "In Words will be visible once you save the Purchase Order.", 
   "fieldname": "base_in_words", 
   "fieldtype": "Data", 
@@ -1740,6 +1808,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_rounded_total", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1767,6 +1836,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break4", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -1791,6 +1861,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "grand_total", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1818,6 +1889,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "in_words", 
   "fieldtype": "Data", 
   "hidden": 0, 
@@ -1844,6 +1916,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "advance_paid", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1870,6 +1943,7 @@
   "bold": 0, 
   "collapsible": 1, 
   "collapsible_depends_on": "terms", 
+   "columns": 0, 
   "fieldname": "terms_section_break", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1896,6 +1970,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "tc_name", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -1923,6 +1998,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "terms", 
   "fieldtype": "Text Editor", 
   "hidden": 0, 
@@ -1949,6 +2025,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "more_info", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1974,6 +2051,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "Draft", 
   "fieldname": "status", 
   "fieldtype": "Select", 
@@ -2002,6 +2080,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "ref_sq", 
   "fieldtype": "Data", 
   "hidden": 1, 
@@ -2028,6 +2107,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "party_account_currency", 
   "fieldtype": "Link", 
   "hidden": 1, 
@@ -2054,6 +2134,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_74", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -2078,6 +2159,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:!doc.__islocal", 
   "description": "", 
   "fieldname": "per_received", 
@@ -2106,6 +2188,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:!doc.__islocal", 
   "description": "", 
   "fieldname": "per_billed", 
@@ -2134,6 +2217,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "column_break5", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -2161,6 +2245,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "letter_head", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -2188,6 +2273,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "select_print_heading", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -2215,6 +2301,59 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_86", 
+   "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, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "", 
+   "fieldname": "group_same_items", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Group same items", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "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": "", 
   "fieldname": "language", 
   "fieldtype": "Data", 
@@ -2243,6 +2382,7 @@
   "bold": 0, 
   "collapsible": 1, 
   "collapsible_depends_on": "supplied_items", 
+   "columns": 0, 
   "description": "", 
   "fieldname": "raw_material_details", 
   "fieldtype": "Section Break", 
@@ -2270,6 +2410,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "supplied_items", 
   "fieldtype": "Table", 
   "hidden": 0, 
@@ -2298,6 +2439,7 @@
   "bold": 0, 
   "collapsible": 1, 
   "collapsible_depends_on": "is_recurring", 
+   "columns": 0, 
   "fieldname": "recurring_order", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -2323,6 +2465,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -2347,6 +2490,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.docstatus<2", 
   "description": "", 
   "fieldname": "is_recurring", 
@@ -2373,6 +2517,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "is_recurring", 
   "description": "", 
   "fieldname": "recurring_id", 
@@ -2400,6 +2545,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
   "description": "", 
   "fieldname": "recurring_type", 
@@ -2427,6 +2573,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
   "description": "", 
   "fieldname": "repeat_on_day_of_month", 
@@ -2453,6 +2600,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
   "description": "", 
   "fieldname": "end_date", 
@@ -2479,6 +2627,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
   "fieldname": "submit_on_creation", 
   "fieldtype": "Check", 
@@ -2505,6 +2654,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
   "description": "", 
   "fieldname": "notify_by_email", 
@@ -2532,6 +2682,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.is_recurring && doc.notify_by_email && doc.recurring_id === doc.name", 
   "description": "", 
   "fieldname": "notification_email_address", 
@@ -2559,6 +2710,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.is_recurring && doc.notify_by_email && doc.recurring_id === doc.name", 
   "fieldname": "recurring_print_format", 
   "fieldtype": "Link", 
@@ -2586,6 +2738,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break83", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -2610,6 +2763,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "is_recurring", 
   "description": "", 
   "fieldname": "from_date", 
@@ -2636,6 +2790,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "is_recurring", 
   "description": "", 
   "fieldname": "to_date", 
@@ -2662,6 +2817,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "is_recurring", 
   "description": "", 
   "fieldname": "next_date", 
@@ -2696,7 +2852,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2016-07-07 11:32:05.248626", 
+ "modified": "2016-10-20 03:07:24.683178", 
 "modified_by": "Administrator", 
 "module": "Buying", 
 "name": "Purchase Order", 
@@ -2712,6 +2868,7 @@
   "export": 0, 
   "if_owner": 0, 
   "import": 0, 
+   "is_custom": 0, 
   "permlevel": 0, 
   "print": 0, 
   "read": 1, 
@@ -2732,6 +2889,7 @@
   "export": 0, 
   "if_owner": 0, 
   "import": 0, 
+   "is_custom": 0, 
   "permlevel": 0, 
   "print": 1, 
   "read": 1, 
@@ -2752,6 +2910,7 @@
   "export": 0, 
   "if_owner": 0, 
   "import": 0, 
+   "is_custom": 0, 
   "permlevel": 0, 
   "print": 1, 
   "read": 1, 
@@ -2772,6 +2931,7 @@
   "export": 0, 
   "if_owner": 0, 
   "import": 0, 
+   "is_custom": 0, 
   "permlevel": 1, 
   "print": 0, 
   "read": 1, 
--- a/erpnext/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py
@@ -155,6 +155,30 @@ class PurchaseOrder(BuyingController):
 		if date_diff and date_diff[0][0]:
 			msgprint(_("{0} {1} has been modified. Please refresh.").format(self.doctype, self.name),
 				raise_exception=True)
+				
+	def before_print(self):
+		if self.get("group_same_items"):
+			
+			group_item_qty = {}
+			group_item_amount = {}
+
+			for item in self.items:
+				group_item_qty[item.item_code] = group_item_qty.get(item.item_code, 0) + item.qty
+				group_item_amount[item.item_code] = group_item_amount.get(item.item_code, 0) + item.amount
+				
+			duplicate_list = []
+			
+			for item in self.items:
+				if item.item_code in group_item_qty:
+					item.qty = group_item_qty[item.item_code]
+					item.amount = group_item_amount[item.item_code]
+					del group_item_qty[item.item_code]
+				else:
+					duplicate_list.append(item)
+					
+			for item in duplicate_list:
+				self.remove(item)
+				

 	def update_status(self, status):
 		self.check_modified_date()
@@ -302,6 +326,11 @@ def make_purchase_invoice(source_name, target_doc=None):
 		target.amount = flt(obj.amount) - flt(obj.billed_amt)
 		target.base_amount = target.amount * flt(source_parent.conversion_rate)
 		target.qty = target.amount / flt(obj.rate) if (flt(obj.rate) and flt(obj.billed_amt)) else flt(obj.qty)
+		
+		item = frappe.db.get_value("Item", target.item_code, ["item_group", "buying_cost_center"], as_dict=1)
+		target.cost_center = frappe.db.get_value("Project", obj.project, "cost_center") \
+			or item.buying_cost_center \
+			or frappe.db.get_value("Item Group", item.item_group, "default_cost_center")

 	doc = get_mapped_doc("Purchase Order", source_name,	{
 		"Purchase Order": {
--- a/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py
@@ -1,24 +1,25 @@
 from frappe import _

-data = {
-	'fieldname': 'purchase_order',
-	'internal_links': {
-		'Material Request': ['items', 'material_request'],
-		'Supplier Quotation': ['items', 'supplier_quotation'],
-		'Project': ['project'],
-	},
-	'transactions': [
-		{
-			'label': _('Related'),
-			'items': ['Purchase Receipt', 'Purchase Invoice']
+def get_data():
+	return {
+		'fieldname': 'purchase_order',
+		'internal_links': {
+			'Material Request': ['items', 'material_request'],
+			'Supplier Quotation': ['items', 'supplier_quotation'],
+			'Project': ['project'],
 		},
-		{
-			'label': _('Reference'),
-			'items': ['Material Request', 'Supplier Quotation', 'Project']
-		},
-		{
-			'label': _('Sub-contracting'),
-			'items': ['Stock Entry']
-		},
-	]
-}
+		'transactions': [
+			{
+				'label': _('Related'),
+				'items': ['Purchase Receipt', 'Purchase Invoice']
+			},
+			{
+				'label': _('Reference'),
+				'items': ['Material Request', 'Supplier Quotation', 'Project']
+			},
+			{
+				'label': _('Sub-contracting'),
+				'items': ['Stock Entry']
+			},
+		]
+	}
--- a/erpnext/buying/doctype/purchase_order/test_purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/test_purchase_order.py
@@ -110,6 +110,37 @@ class TestPurchaseOrder(unittest.TestCase):
 		po.update_status("Closed")

 		self.assertEquals(get_ordered_qty(item_code="_Test Item", warehouse="_Test Warehouse - _TC"), existing_ordered_qty)
+		
+	def test_group_same_items(self):
+		frappe.get_doc({
+			"doctype": "Purchase Order",
+			"company": "_Test Company",
+			"supplier" : "_Test Supplier",
+			"is_subcontracted" : "No",
+			"currency" : frappe.db.get_value("Company", "_Test Company", "default_currency"),
+			"conversion_factor" : 1,
+			"items" : get_same_items(),
+			"group_same_items": 1
+		}).insert()
+
+		
+def get_same_items():	
+	return [
+				{
+					"item_code": "_Test FG Item",
+					"warehouse": "_Test Warehouse - _TC",
+					"qty": 1,
+					"rate": 500,
+					"schedule_date": add_days(nowdate(), 1)
+				},
+				{
+					"item_code": "_Test FG Item",
+					"warehouse": "_Test Warehouse - _TC",
+					"qty": 4,
+					"rate": 500,
+					"schedule_date": add_days(nowdate(), 1)
+				}
+			]		

 def create_purchase_order(**args):
 	po = frappe.new_doc("Purchase Order")
--- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
+++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
@@ -15,6 +15,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 3, 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -42,6 +43,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "", 
   "fieldname": "supplier_part_no", 
   "fieldtype": "Data", 
@@ -67,13 +69,14 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "item_name", 
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
   "in_filter": 1, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
   "label": "Item Name", 
   "length": 0, 
   "no_copy": 0, 
@@ -93,6 +96,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_4", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -114,9 +118,10 @@
   "unique": 0
  }, 
  {
-   "allow_on_submit": 0, 
+   "allow_on_submit": 1, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "schedule_date", 
   "fieldtype": "Date", 
   "hidden": 0, 
@@ -139,10 +144,37 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 1, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "expected_delivery_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Expected Delivery Date", 
+   "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": 1, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
  {
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "section_break_5", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -168,6 +200,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "description", 
   "fieldtype": "Text Editor", 
   "hidden": 0, 
@@ -196,6 +229,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "col_break1", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -219,6 +253,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "image", 
   "fieldtype": "Attach", 
   "hidden": 1, 
@@ -244,6 +279,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "image_view", 
   "fieldtype": "Image", 
   "hidden": 0, 
@@ -270,6 +306,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "quantity_and_rate", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -294,6 +331,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 2, 
   "fieldname": "qty", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -322,13 +360,14 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "stock_uom", 
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
   "label": "Stock UOM", 
   "length": 0, 
   "no_copy": 0, 
@@ -351,6 +390,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "col_break2", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -374,13 +414,14 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "uom", 
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
   "label": "UOM", 
   "length": 0, 
   "no_copy": 0, 
@@ -403,6 +444,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "conversion_factor", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -431,6 +473,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "sec_break1", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -454,6 +497,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "price_list_rate", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -479,6 +523,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "price_list_rate", 
   "fieldname": "discount_percentage", 
   "fieldtype": "Percent", 
@@ -486,7 +531,7 @@
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
   "label": "Discount on Price List Rate (%)", 
   "length": 0, 
   "no_copy": 0, 
@@ -504,6 +549,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "col_break3", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -527,6 +573,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_price_list_rate", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -552,6 +599,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "sec_break2", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -575,6 +623,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 3, 
   "fieldname": "rate", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -582,7 +631,7 @@
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
-   "label": "Rate ", 
+   "label": "Rate", 
   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "import_rate", 
@@ -602,6 +651,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 2, 
   "fieldname": "amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -629,6 +679,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "col_break4", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -652,6 +703,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_rate", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -681,6 +733,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -708,6 +761,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "pricing_rule", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -733,6 +787,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "section_break_29", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -757,6 +812,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "net_rate", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -783,6 +839,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "net_amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -809,6 +866,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_32", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -833,6 +891,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_net_rate", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -859,6 +918,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_net_amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -885,6 +945,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "warehouse_and_reference", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -909,6 +970,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "warehouse", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -936,6 +998,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "project", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -961,6 +1024,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "material_request", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -990,6 +1054,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "material_request_item", 
   "fieldtype": "Data", 
   "hidden": 1, 
@@ -1016,6 +1081,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "sales_order", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -1042,6 +1108,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "sales_order_item", 
   "fieldtype": "Data", 
   "hidden": 1, 
@@ -1067,6 +1134,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "supplier_quotation", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -1092,6 +1160,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "supplier_quotation_item", 
   "fieldtype": "Link", 
   "hidden": 1, 
@@ -1117,6 +1186,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "delivered_by_supplier", 
   "fieldtype": "Check", 
   "hidden": 0, 
@@ -1142,6 +1212,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "col_break5", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -1165,6 +1236,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "", 
   "fieldname": "item_group", 
   "fieldtype": "Link", 
@@ -1193,6 +1265,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "brand", 
   "fieldtype": "Link", 
   "hidden": 1, 
@@ -1220,6 +1293,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "bom", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -1246,6 +1320,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "stock_qty", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -1274,6 +1349,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "received_qty", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -1300,6 +1376,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "returned_qty", 
   "fieldname": "returned_qty", 
   "fieldtype": "Float", 
@@ -1326,6 +1403,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "billed_amt", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1351,6 +1429,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges", 
   "fieldname": "item_tax_rate", 
   "fieldtype": "Code", 
@@ -1378,6 +1457,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "page_break", 
   "fieldtype": "Check", 
   "hidden": 0, 
@@ -1411,7 +1491,7 @@
 "issingle": 0, 
 "istable": 1, 
 "max_attachments": 0, 
- "modified": "2016-07-11 03:28:05.251792", 
+ "modified": "2016-10-26 16:07:40.592325", 
 "modified_by": "Administrator", 
 "module": "Buying", 
 "name": "Purchase Order Item", 
@@ -1423,4 +1503,4 @@
 "sort_field": "modified", 
 "sort_order": "DESC", 
 "track_seen": 0
-}
+}
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
@@ -14,19 +14,6 @@ frappe.ui.form.on("Request for Quotation",{
 				filters: {'supplier': d.supplier}
 			}
 		}
-
-		frm.get_field('items').grid.editable_fields = [
-			{fieldname: 'item_code', columns: 3},
-			{fieldname: 'qty', columns: 2},
-			{fieldname: 'schedule_date', columns: 2},
-			{fieldname: 'warehouse', columns: 3},
-		];
-
-		frm.get_field('suppliers').grid.editable_fields = [
-			{fieldname: 'supplier', columns: 4},
-			{fieldname: 'contact', columns: 3},
-			{fieldname: 'email_id', columns: 3}
-		];
 	},

 	onload: function(frm) {
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -15,6 +15,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "naming_series", 
   "fieldtype": "Select", 
   "hidden": 0, 
@@ -43,6 +44,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "", 
   "fieldname": "company", 
   "fieldtype": "Link", 
@@ -72,6 +74,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "For individual supplier", 
   "fieldname": "vendor", 
   "fieldtype": "Link", 
@@ -99,6 +102,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -126,6 +130,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "transaction_date", 
   "fieldtype": "Date", 
   "hidden": 0, 
@@ -153,6 +158,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "suppliers_section", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -178,6 +184,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "suppliers", 
   "fieldtype": "Table", 
   "hidden": 0, 
@@ -204,6 +211,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "items_section", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -231,6 +239,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "items", 
   "fieldtype": "Table", 
   "hidden": 0, 
@@ -259,6 +268,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "supplier_response_section", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -284,6 +294,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "standard_reply", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -310,6 +321,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "message_for_supplier", 
   "fieldtype": "Text Editor", 
   "hidden": 0, 
@@ -336,6 +348,7 @@
   "bold": 0, 
   "collapsible": 1, 
   "collapsible_depends_on": "terms", 
+   "columns": 0, 
   "fieldname": "terms_section_break", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -363,6 +376,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "tc_name", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -391,6 +405,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "terms", 
   "fieldtype": "Text Editor", 
   "hidden": 0, 
@@ -418,6 +433,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "printing_settings", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -443,6 +459,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "select_print_heading", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -471,6 +488,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "letter_head", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -499,6 +517,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "more_info", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -526,6 +545,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "status", 
   "fieldtype": "Select", 
   "hidden": 0, 
@@ -554,6 +574,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "fiscal_year", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -582,6 +603,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break3", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -606,6 +628,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "amended_from", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -639,8 +662,8 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2016-08-01 08:45:39.777405", 
- "modified_by": "Administrator", 
+ "modified": "2016-09-29 11:56:57.123429", 
+ "modified_by": "neil@frappe.io", 
 "module": "Buying", 
 "name": "Request for Quotation", 
 "name_case": "", 
@@ -726,26 +749,6 @@
   "submit": 0, 
   "write": 0
  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Supplier", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 0
-  }, 
  {
   "amend": 0, 
   "apply_user_permissions": 0, 
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
@@ -192,8 +192,6 @@ def create_supplier_quotation(doc):
 	if isinstance(doc, basestring):
 		doc = json.loads(doc)

-	validate_duplicate_supplier_quotation(doc)
-
 	try:
 		sq_doc = frappe.get_doc({
 			"doctype": "Supplier Quotation",
@@ -210,7 +208,7 @@ def create_supplier_quotation(doc):
 		frappe.msgprint(_("Supplier Quotation {0} created").format(sq_doc.name))
 		return sq_doc.name
 	except Exception:
-		return
+		return None

 def add_items(sq_doc, supplier, items):
 	for data in items:
@@ -245,13 +243,3 @@ def get_rfq_doc(doctype, name, supplier_idx):
 		args = doc.get('suppliers')[cint(supplier_idx) - 1]
 		doc.update_supplier_part_no(args)
 		return doc
-
-@frappe.whitelist()
-def validate_duplicate_supplier_quotation(args):
-	data = frappe.db.sql("""select sq.name as name from `tabSupplier Quotation` sq, 
-		`tabSupplier Quotation Item` sqi where sqi.parent = sq.name and sq.supplier = %(supplier)s 
-		and sqi.request_for_quotation = %(rfq)s and sq.docstatus < 2""",
-		{'supplier': args.get('supplier'), 'rfq': args.get('name')}, as_dict=True)
-
-	if data and data[0] and data[0].name:
-		frappe.throw(_("Already supplier quotation has created"))
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation_dashboard.py
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation_dashboard.py
@@ -1,12 +1,13 @@
 from frappe import _

-data = {
-	'docstatus': 1,
-	'fieldname': 'request_for_quotation',
-	'transactions': [
-		{
-			'label': _('Related'),
-			'items': ['Supplier Quotation']
-		},
-	]
-}
+def get_data():
+	return {
+		'docstatus': 1,
+		'fieldname': 'request_for_quotation',
+		'transactions': [
+			{
+				'label': _('Related'),
+				'items': ['Supplier Quotation']
+			},
+		]
+	}
--- a/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json
+++ b/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json
@@ -15,6 +15,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 3, 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -43,6 +44,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "supplier_part_no", 
   "fieldtype": "Data", 
   "hidden": 1, 
@@ -68,6 +70,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_3", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -92,13 +95,14 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "item_name", 
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
   "in_filter": 1, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
   "label": "Item Name", 
   "length": 0, 
   "no_copy": 0, 
@@ -119,6 +123,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "section_break_5", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -144,6 +149,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "description", 
   "fieldtype": "Text Editor", 
   "hidden": 0, 
@@ -173,6 +179,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "col_break1", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -197,6 +204,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "image", 
   "fieldtype": "Attach", 
   "hidden": 1, 
@@ -222,6 +230,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "image_view", 
   "fieldtype": "Image", 
   "hidden": 0, 
@@ -248,6 +257,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "quantity", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -273,6 +283,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 2, 
   "fieldname": "qty", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -302,6 +313,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "col_break2", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -326,6 +338,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 2, 
   "default": "Today", 
   "fieldname": "schedule_date", 
   "fieldtype": "Date", 
@@ -333,7 +346,7 @@
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
-   "in_list_view": 0, 
+   "in_list_view": 1, 
   "label": "Required Date", 
   "length": 0, 
   "no_copy": 0, 
@@ -352,13 +365,14 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "uom", 
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
   "label": "UOM", 
   "length": 0, 
   "no_copy": 0, 
@@ -382,6 +396,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "warehouse_and_reference", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -407,6 +422,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 3, 
   "fieldname": "warehouse", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -435,6 +451,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "project_name", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -461,6 +478,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "material_request", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -487,6 +505,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "col_break4", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -511,6 +530,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "material_request_item", 
   "fieldtype": "Data", 
   "hidden": 1, 
@@ -536,6 +556,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "brand", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -564,6 +585,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "", 
   "fieldname": "item_group", 
   "fieldtype": "Link", 
@@ -593,6 +615,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "page_break", 
   "fieldtype": "Check", 
   "hidden": 0, 
@@ -627,7 +650,7 @@
 "issingle": 0, 
 "istable": 1, 
 "max_attachments": 0, 
- "modified": "2016-07-11 03:28:06.681590", 
+ "modified": "2016-08-26 02:40:48.487168", 
 "modified_by": "Administrator", 
 "module": "Buying", 
 "name": "Request for Quotation Item", 
--- a/erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.json
+++ b/erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.json
@@ -14,6 +14,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "1", 
   "fieldname": "send_email", 
   "fieldtype": "Check", 
@@ -40,6 +41,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 4, 
   "fieldname": "supplier", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -66,6 +68,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 3, 
   "fieldname": "contact", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -92,6 +95,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_3", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -116,13 +120,14 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "supplier_name", 
   "fieldtype": "Read Only", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
   "label": "Supplier Name", 
   "length": 0, 
   "no_copy": 0, 
@@ -142,13 +147,14 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 3, 
   "fieldname": "email_id", 
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
-   "in_list_view": 0, 
+   "in_list_view": 1, 
   "label": "Email Id", 
   "length": 0, 
   "no_copy": 1, 
@@ -168,6 +174,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "download_pdf", 
   "fieldtype": "Button", 
   "hidden": 0, 
@@ -200,7 +207,7 @@
 "issingle": 0, 
 "istable": 1, 
 "max_attachments": 0, 
- "modified": "2016-07-11 03:28:06.830030", 
+ "modified": "2016-08-26 02:38:45.634613", 
 "modified_by": "Administrator", 
 "module": "Buying", 
 "name": "Request for Quotation Supplier", 
--- a/erpnext/buying/doctype/supplier/supplier.js
+++ b/erpnext/buying/doctype/supplier/supplier.js
@@ -2,8 +2,18 @@
 // License: GNU General Public License v3. See license.txt

 frappe.ui.form.on("Supplier", {
-	before_load: function(frm) {
-		frappe.setup_language_field(frm);
+	setup: function(frm) {
+		frm.set_query('default_price_list', { 'buying': 1});
+		frm.set_query('account', 'accounts', function(doc, cdt, cdn) {
+			var d  = locals[cdt][cdn];
+			return {
+				filters: {
+					'account_type': 'Payable',
+					'company': d.company,
+					"is_group": 0
+				}
+			}
+		});
 	},
 	refresh: function(frm) {
 		if(frappe.defaults.get_default("supp_master_name")!="Naming Series") {
@@ -19,23 +29,18 @@ frappe.ui.form.on("Supplier", {
 		else {
 		  	unhide_field(['address_html','contact_html']);
 			erpnext.utils.render_address_and_contact(frm);
+
+			// custom buttons
+			frm.add_custom_button(__('Accounting Ledger'), function() {
+				frappe.set_route('query-report', 'General Ledger',
+					{party_type:'Supplier', party:frm.doc.name});
+			});
+			frm.add_custom_button(__('Accounts Payable'), function() {
+				frappe.set_route('query-report', 'Accounts Payable', {supplier:frm.doc.name});
+			});
+
+			// indicators
+			erpnext.utils.set_party_dashboard_indicators(frm);
 		}
 	},
 });
-
-cur_frm.fields_dict['default_price_list'].get_query = function(doc, cdt, cdn) {
-	return{
-		filters:{'buying': 1}
-	}
-}
-
-cur_frm.fields_dict['accounts'].grid.get_field('account').get_query = function(doc, cdt, cdn) {
-	var d  = locals[cdt][cdn];
-	return {
-		filters: {
-			'account_type': 'Payable',
-			'company': d.company,
-			"is_group": 0
-		}
-	}
-}
--- a/Show More
+++ b/Show More