Merge branch 'hotfix'

bumped to version 7.0.51
Merge pull request #6485 from rohitwaghchaure/enhancement_payment_entry
2016-09-29 14:16:43 +05:30 · 2016-09-29 14:46:42 +06:00 · 2016-09-29 13:57:48 +05:30 · 2016-09-29 13:55:38 +05:30 · 2016-09-29 13:51:51 +05:30 · 2016-09-29 13:49:31 +05:30
42 changed files with 636 additions and 100 deletions
--- a/erpnext/init.py
+++ b/erpnext/init.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe

-__version__ = '7.0.44'
+__version__ = '7.0.51'

 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
@@ -48,5 +48,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/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/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -511,6 +511,18 @@ frappe.ui.form.on('Payment Entry', {
 		});
 	},

+	allocate_payment_amount: function(frm) {
+		if(frm.doc.payment_type == 'Internal Transfer'){
+			return
+		}
+
+		if(frm.doc.references.length == 0){
+			frm.events.get_outstanding_documents(frm);
+		}
+
+		frm.events.allocate_party_amount_against_ref_docs(frm, frm.doc.received_amount);
+	},
+
 	allocate_party_amount_against_ref_docs: function(frm, paid_amount) {
 		var total_positive_outstanding_including_order = 0;
 		var total_negative_outstanding = 0;
@@ -552,22 +564,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
@@ -772,6 +772,34 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "1", 
+   "depends_on": "eval:in_list(['Pay', 'Receive'], doc.payment_type)", 
+   "fieldname": "allocate_payment_amount", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "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, 
@@ -1426,7 +1454,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2016-09-05 11:06:18.183458", 
+ "modified": "2016-09-28 18:20:47.625383", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Payment Entry", 
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -669,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/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/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, 
@@ -380,7 +380,7 @@
   "in_list_view": 0, 
   "label": "Return Against Sales Invoice", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "options": "Sales Invoice", 
   "permlevel": 0, 
   "precision": "", 
@@ -3867,7 +3867,7 @@
 "istable": 0, 
 "max_attachments": 0, 
 "menu_index": 0, 
- "modified": "2016-08-31 15:47:32.064861", 
+ "modified": "2016-09-23 17:59:42.200474", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Sales Invoice", 
--- a/erpnext/accounts/page/pos/pos.js
+++ b/erpnext/accounts/page/pos/pos.js
@@ -655,7 +655,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,
--- 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/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -124,6 +124,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 +218,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
 				order by posting_date, party"""
 				.format(select_fields, conditions), values, as_dict=True)

--- a/erpnext/accounts/report/cash_flow/cash_flow.py
+++ b/erpnext/accounts/report/cash_flow/cash_flow.py
@@ -59,7 +59,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 +81,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
@@ -129,7 +129,7 @@ def get_account_type_based_data(company, account_type, period_list, accumulated_
 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/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:
@@ -32,7 +34,8 @@ def execute(filters=None):
 			from `tabDelivery Note Item` where docstatus=1 and so_detail=%s""", d.so_detail))

 		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 +55,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 +71,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 +91,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
 		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/profit_and_loss_statement/profit_and_loss_statement.py
+++ b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
@@ -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")
 		}
--- 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/hr/doctype/leave_application/leave_application.py
+++ b/erpnext/hr/doctype/leave_application/leave_application.py
@@ -97,12 +97,19 @@ class LeaveApplication(Document):
 				.format(formatdate(future_allocation[0].from_date), future_allocation[0].name))

 	def validate_salary_processed_days(self):
-		last_processed_pay_slip = frappe.db.sql("""select start_date, end_date from `tabSalary Slip`
-						where docstatus != 2 and employee = %s and ((%s between start_date and end_date) or (%s between start_date and end_date)) order by modified desc limit 1""",(self.employee, self.to_date, self.from_date))
+		if not frappe.db.get_value("Leave Type", self.leave_type, "is_lwp"):
+			return
+			
+		last_processed_pay_slip = frappe.db.sql("""
+			select start_date, end_date from `tabSalary Slip`
+			where docstatus != 2 and employee = %s 
+			and ((%s between start_date and end_date) or (%s between start_date and end_date)) 
+			order by modified desc limit 1
+		""",(self.employee, self.to_date, self.from_date))

 		if last_processed_pay_slip:
-			frappe.throw(_("Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.").
-					format(formatdate(last_processed_pay_slip[0][0]), formatdate(last_processed_pay_slip[0][1])))
+			frappe.throw(_("Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.").format(formatdate(last_processed_pay_slip[0][0]), 
+				formatdate(last_processed_pay_slip[0][1])))


 	def show_block_day_warning(self):
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -23,17 +23,15 @@ execute:frappe.reload_doc('selling', 'doctype', 'customer') # 2014-01-29
 execute:frappe.reload_doc('buying', 'doctype', 'supplier') # 2014-01-29
 execute:frappe.reload_doc('accounts', 'doctype', 'asset_category')
 execute:frappe.reload_doc('accounts', 'doctype', 'pricing_rule')
-execute:frappe.reload_doctype('Item')
 erpnext.patches.v4_0.map_charge_to_taxes_and_charges
 execute:frappe.reload_doc('support', 'doctype', 'newsletter') # 2014-01-31
 execute:frappe.reload_doc('hr', 'doctype', 'employee') # 2014-02-03
 execute:frappe.db.sql("update tabPage set module='Core' where name='Setup'")
-
 erpnext.patches.v5_2.change_item_selects_to_checks
+execute:frappe.reload_doctype('Item')
 erpnext.patches.v4_0.fields_to_be_renamed
 erpnext.patches.v4_0.rename_sitemap_to_route
 erpnext.patches.v7_0.re_route #2016-06-27
-
 erpnext.patches.v4_0.fix_contact_address
 erpnext.patches.v4_0.customer_discount_to_pricing_rule
 execute:frappe.db.sql("""delete from `tabWebsite Item Group` where ifnull(item_group, '')=''""")
@@ -173,6 +171,7 @@ execute:frappe.db.set_value("Backup Manager", None, "send_backups_to_dropbox", 1
 execute:frappe.db.sql_list("delete from `tabDocPerm` where parent='Issue' and modified_by='Administrator' and role='Guest'")
 erpnext.patches.v5_0.update_item_and_description_again
 erpnext.patches.v6_0.multi_currency
+erpnext.patches.v7_0.create_budget_record
 erpnext.patches.v5_0.repost_gle_for_jv_with_multiple_party
 erpnext.patches.v5_0.portal_fixes
 erpnext.patches.v5_0.reset_values_in_tools # 02-05-2016
@@ -235,7 +234,6 @@ execute:frappe.delete_doc_if_exists("DocType", "Shopping Cart Taxes and Charges
 erpnext.patches.v6_4.set_user_in_contact
 erpnext.patches.v6_4.make_image_thumbnail #2015-10-20
 erpnext.patches.v6_5.show_in_website_for_template_item
-erpnext.patches.v7_0.create_budget_record
 erpnext.patches.v6_4.fix_expense_included_in_valuation
 execute:frappe.delete_doc_if_exists("Report", "Item-wise Last Purchase Rate")
 erpnext.patches.v6_6.fix_website_image
@@ -266,7 +264,7 @@ erpnext.patches.v6_20x.remove_fiscal_year_from_holiday_list
 erpnext.patches.v6_24.map_customer_address_to_shipping_address_on_po
 erpnext.patches.v6_27.fix_recurring_order_status
 erpnext.patches.v6_20x.update_product_bundle_description
-erpnext.patches.v7_0.update_party_status
+erpnext.patches.v7_0.update_party_status #2016-09-22
 erpnext.patches.v7_0.update_item_projected
 erpnext.patches.v7_0.remove_features_setup
 erpnext.patches.v7_0.update_home_page
@@ -284,7 +282,7 @@ execute:frappe.reload_doc('projects', 'doctype', 'project_user')
 erpnext.patches.v7_0.convert_timelogbatch_to_timesheet
 erpnext.patches.v7_0.convert_timelog_to_timesheet
 erpnext.patches.v7_0.move_timelogbatch_from_salesinvoiceitem_to_salesinvoicetimesheet
-erpnext.patches.v7_0.remove_doctypes_and_reports
+erpnext.patches.v7_0.remove_doctypes_and_reports #2016-10-29
 erpnext.patches.v7_0.update_maintenance_module_in_doctype
 erpnext.patches.v7_0.update_prevdoc_values_for_supplier_quotation_item
 erpnext.patches.v7_0.rename_advance_table_fields
@@ -310,6 +308,7 @@ erpnext.patches.v7_0.update_refdoc_in_landed_cost_voucher
 erpnext.patches.v7_0.set_material_request_type_in_item
 erpnext.patches.v7_0.rename_examination_to_assessment
 erpnext.patches.v7_0.set_portal_settings
+erpnext.patches.v7_0.update_change_amount_account
 erpnext.patches.v7_0.repost_future_gle_for_purchase_invoice
 erpnext.patches.v7_0.fix_duplicate_icons
 erpnext.patches.v7_0.repost_gle_for_pos_sales_return
@@ -317,4 +316,5 @@ erpnext.patches.v7_0.update_missing_employee_in_timesheet
 erpnext.patches.v7_0.update_status_for_timesheet
 erpnext.patches.v7_0.set_party_name_in_payment_entry
 execute:frappe.db.sql("update `tabTimesheet` ts, `tabEmployee` emp set ts.employee_name = emp.employee_name where emp.name = ts.employee and ts.employee_name is null and ts.employee is not null")
+execute:frappe.db.sql("delete from `tabTimesheet Detail` where NOT EXISTS (select name from `tabTimesheet` where name = `tabTimesheet Detail`.parent)")
 erpnext.patches.v7_0.update_mode_of_payment_type
--- a/erpnext/patches/v7_0/convert_timelog_to_timesheet.py
+++ b/erpnext/patches/v7_0/convert_timelog_to_timesheet.py
@@ -27,6 +27,7 @@ def execute():
 		time_sheet.update_cost()
 		time_sheet.calculate_total_amounts()
 		time_sheet.flags.ignore_validate = True
+		time_sheet.flags.ignore_links = True
 		time_sheet.save(ignore_permissions=True)

 		# To ignore validate_mandatory_fields function
--- a/erpnext/patches/v7_0/convert_timelogbatch_to_timesheet.py
+++ b/erpnext/patches/v7_0/convert_timelogbatch_to_timesheet.py
@@ -17,10 +17,10 @@ def execute():
 			add_timesheet_detail(time_sheet, args)

 		time_sheet.docstatus = tlb.docstatus
+		time_sheet.flags.ignore_links = True
 		time_sheet.save(ignore_permissions=True)

 def get_timesheet_data(data):
-	time_log = frappe.get_all('Time Log', fields=["*"],
-		filters = {'name': data.time_log})[0]
-
-	return get_timelog_data(time_log)
+	time_log = frappe.get_all('Time Log', fields=["*"], filters = {'name': data.time_log})
+	if time_log:
+		return get_timelog_data(time_log[0])
--- a/erpnext/patches/v7_0/create_warehouse_nestedset.py
+++ b/erpnext/patches/v7_0/create_warehouse_nestedset.py
@@ -29,10 +29,11 @@ def execute():
 			make_warehouse_nestedset(company)
 	else:
 		sle_against_companies = frappe.db.sql_list("""select distinct company from `tabStock Ledger Entry`""")
-		company = frappe.defaults.get_defaults().company

 		if len(sle_against_companies) == 1:
-			set_company_to_warehouse(company)
+			company = frappe.db.get_value("Company", sle_against_companies[0], 
+				fieldname=["name", "abbr"], as_dict=1)
+			set_company_to_warehouse(company.name)
 			make_warehouse_nestedset(company)

 		elif len(sle_against_companies) > 1:
--- a/erpnext/patches/v7_0/move_timelogbatch_from_salesinvoiceitem_to_salesinvoicetimesheet.py
+++ b/erpnext/patches/v7_0/move_timelogbatch_from_salesinvoiceitem_to_salesinvoicetimesheet.py
@@ -5,6 +5,8 @@ def execute():
 	frappe.reload_doc('accounts', 'doctype', 'sales_invoice_payment')
 	for time_sheet in frappe.db.sql(""" select sales_invoice, name, total_billing_amount from `tabTimesheet`
 		where sales_invoice is not null and docstatus < 2""", as_dict=True):
+		if not frappe.db.exists('Sales Invoice', time_sheet.sales_invoice):
+			continue
 		si_doc = frappe.get_doc('Sales Invoice', time_sheet.sales_invoice)
 		ts = si_doc.append('timesheets',{})
 		ts.time_sheet = time_sheet.name
--- a/erpnext/patches/v7_0/remove_doctypes_and_reports.py
+++ b/erpnext/patches/v7_0/remove_doctypes_and_reports.py
@@ -5,6 +5,21 @@ def execute():
 		frappe.db.sql("""delete from `tabDocType`
 			where name in('Time Log Batch', 'Time Log Batch Detail', 'Time Log')""")

+	frappe.db.sql("""delete from `tabDocField` where parent in ('Time Log', 'Time Log Batch')""")
+	frappe.db.sql("""update `tabCustom Script` set dt = 'Timesheet' where dt = 'Time Log'""")
+
+	for data in frappe.db.sql(""" select label, fieldname from  `tabCustom Field` where dt = 'Time Log'""", as_dict=1):
+		custom_field = frappe.get_doc({
+			'doctype': 'Custom Field',
+			'label': data.label,
+			'dt': 'Timesheet Detail',
+			'fieldname': data.fieldname
+		}).insert(ignore_permissions=True)
+
+	frappe.db.sql("""delete from `tabCustom Field` where dt = 'Time Log'""")
+	frappe.reload_doc('projects', 'doctype', 'timesheet')
+	frappe.reload_doc('projects', 'doctype', 'timesheet_detail')
+
 	report = "Daily Time Log Summary"
 	if frappe.db.exists("Report", report):
 		frappe.delete_doc('Report', report)
--- a/erpnext/patches/v7_0/remove_features_setup.py
+++ b/erpnext/patches/v7_0/remove_features_setup.py
@@ -7,6 +7,8 @@ def execute():
 	frappe.reload_doctype('Stock Settings')
 	stock_settings = frappe.get_doc('Stock Settings', 'Stock Settings')
 	stock_settings.show_barcode_field = cint(frappe.db.get_value("Features Setup", None, "fs_item_barcode"))
+	if not frappe.db.exists("UOM", stock_settings.stock_uom):
+		stock_settings.stock_uom = None
 	stock_settings.save()

 	create_compact_item_print_custom_field()
--- a/erpnext/patches/v7_0/repost_gle_for_pos_sales_return.py
+++ b/erpnext/patches/v7_0/repost_gle_for_pos_sales_return.py
@@ -7,6 +7,7 @@ from frappe.utils import cint, flt

 def execute():
 	frappe.reload_doctype("Sales Invoice")
+	frappe.reload_doctype("Sales Invoice Item")
 	
 	for si in frappe.get_all("Sales Invoice", fields = ["name"], 
 		filters={"docstatus": 1, "is_pos": 1, "is_return": 1}):
--- a/erpnext/patches/v7_0/setup_account_table_for_expense_claim_type_if_exists.py
+++ b/erpnext/patches/v7_0/setup_account_table_for_expense_claim_type_if_exists.py
@@ -16,4 +16,5 @@ def execute():
 				"company": frappe.db.get_value("Account", expense_claim_type.default_account, "company"),
 				"default_account": expense_claim_type.default_account,
 			})
+			doc.flags.ignore_mandatory = True
 			doc.save(ignore_permissions=True)
--- a/erpnext/patches/v7_0/update_change_amount_account.py
+++ b/erpnext/patches/v7_0/update_change_amount_account.py
@@ -0,0 +1,19 @@
+from __future__ import unicode_literals
+import frappe
+from erpnext.accounts.doctype.journal_entry.journal_entry import get_default_bank_cash_account
+
+def execute():
+	frappe.reload_doc('accounts', 'doctype', 'sales_invoice')
+
+	for company in frappe.db.sql("""select company from `tabSales Invoice` 
+		where change_amount <> 0 and account_for_change_amount is null group by company""", as_list = 1):
+		cash_account = get_default_bank_cash_account(company[0], 'Cash').get('account')
+		if not cash_account:
+			bank_account = get_default_bank_cash_account(company[0], 'Bank').get('account')
+			cash_account = bank_account
+
+		if cash_account:
+			frappe.db.sql("""update `tabSales Invoice` 
+				set account_for_change_amount = %(cash_account)s where change_amount <> 0 
+				and company = %(company)s and account_for_change_amount is null""",
+				{'cash_account': cash_account, 'company': company[0]})
--- a/erpnext/patches/v7_0/update_home_page.py
+++ b/erpnext/patches/v7_0/update_home_page.py
@@ -13,7 +13,7 @@ def execute():
 		header = frappe.db.get_value('Web Page', website_settings.home_page, 'header')
 		if header and header.startswith("<div class='hero text-center'>"):
 			homepage = frappe.get_doc('Homepage', 'Homepage')
-			homepage.company = erpnext.get_default_company()
+			homepage.company = erpnext.get_default_company() or frappe.get_all("Company")[0].name
 			if '<h1>' in header:
 				homepage.tag_line = header.split('<h1>')[1].split('</h1>')[0] or 'Default Website'
 			else:
--- a/erpnext/portal/doctype/homepage/homepage.js
+++ b/erpnext/portal/doctype/homepage/homepage.js
@@ -2,6 +2,14 @@
 // For license information, please see license.txt

 frappe.ui.form.on('Homepage', {
+	setup: function(frm) {
+		frm.fields_dict["products"].grid.get_field("item_code").get_query = function(){
+			return {
+				filters: {'show_in_website': 1}
+			}
+		}
+	},
+
 	refresh: function(frm) {

 	},
@@ -35,5 +43,12 @@ frappe.ui.form.on('Homepage Featured Product', {
 				}
 			});
 		}
+	},
+
+	view: function(frm, cdt, cdn){
+		var child= locals[cdt][cdn]
+		if(child.item_code && frm.doc.products_url){
+			window.location.href = frm.doc.products_url + '/' + encodeURIComponent(child.item_code);
+		}
 	}
 });
--- a/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py
+++ b/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
+from frappe.desk.reportview import build_match_conditions

 def execute(filters=None):
 	if not filters:
@@ -12,25 +13,36 @@ def execute(filters=None):
 		filters["from_time"] = "00:00:00"
 		filters["to_time"] = "24:00:00"

-	columns = [_("Timesheet") + ":Link/Timesheet:120", _("Employee") + "::150", _("Employee Name") + "::150", 
-		_("From Datetime") + "::140", _("To Datetime") + "::140", _("Hours") + "::70", 
-		_("Activity Type") + "::120", _("Task") + ":Link/Task:150",
-		_("Project") + ":Link/Project:120", _("Status") + "::70"]
-		
-	conditions = "ts.docstatus = 1"
-	if filters.get("from_date"):
-		conditions += " and tsd.from_time >= timestamp(%(from_date)s, %(from_time)s)"
-	if filters.get("to_date"):
-		conditions += " and tsd.to_time <= timestamp(%(to_date)s, %(to_time)s)"
-	
+	columns = get_column()
+	conditions = get_conditions(filters)
 	data = get_data(conditions, filters)

 	return columns, data

+def get_column():
+	return [_("Timesheet") + ":Link/Timesheet:120", _("Employee") + "::150", _("Employee Name") + "::150", 
+		_("From Datetime") + "::140", _("To Datetime") + "::140", _("Hours") + "::70", 
+		_("Activity Type") + "::120", _("Task") + ":Link/Task:150",
+		_("Project") + ":Link/Project:120", _("Status") + "::70"]
+
 def get_data(conditions, filters):
-	time_sheet = frappe.db.sql(""" select ts.name, ts.employee, ts.employee_name, 
-		tsd.from_time, tsd.to_time, tsd.hours,
-		tsd.activity_type, tsd.task, tsd.project, ts.status from `tabTimesheet Detail` tsd, 
-		`tabTimesheet` ts where ts.name = tsd.parent and %s order by ts.name"""%(conditions), filters, as_list=1)
+	time_sheet = frappe.db.sql(""" select `tabTimesheet`.name, `tabTimesheet`.employee, `tabTimesheet`.employee_name,
+		`tabTimesheet Detail`.from_time, `tabTimesheet Detail`.to_time, `tabTimesheet Detail`.hours,
+		`tabTimesheet Detail`.activity_type, `tabTimesheet Detail`.task, `tabTimesheet Detail`.project,
+		`tabTimesheet`.status from `tabTimesheet Detail`, `tabTimesheet` where
+		`tabTimesheet Detail`.parent = `tabTimesheet`.name and %s order by `tabTimesheet`.name"""%(conditions), filters, as_list=1)

 	return time_sheet
+
+def get_conditions(filters):
+	conditions = "`tabTimesheet`.docstatus = 1"
+	if filters.get("from_date"):
+		conditions += " and `tabTimesheet Detail`.from_time >= timestamp(%(from_date)s, %(from_time)s)"
+	if filters.get("to_date"):
+		conditions += " and `tabTimesheet Detail`.to_time <= timestamp(%(to_date)s, %(to_time)s)"
+
+	match_conditions = build_match_conditions("Timesheet")
+	if match_conditions:
+		conditions += " and %s" % match_conditions
+
+	return conditions
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -678,6 +678,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 					me._set_values_for_item_list(r.message);
 					if(item) me.set_gross_profit(item);
 					if(calculate_taxes_and_totals) me.calculate_taxes_and_totals();
+					if(me.frm.doc.apply_discount_on) me.frm.trigger("apply_discount_on")
 				}
 			}
 		});
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -553,6 +553,9 @@ def get_events(start, end, filters=None):
 def make_purchase_order_for_drop_shipment(source_name, for_supplier, target_doc=None):
 	def set_missing_values(source, target):
 		target.supplier = for_supplier
+		target.apply_discount_on = ""
+		target.additional_discount_percentage = 0.0
+		target.discount_amount = 0.0

 		default_price_list = frappe.get_value("Supplier", for_supplier, "default_price_list")
 		if default_price_list:
--- a/erpnext/setup/doctype/company/delete_company_transactions.py
+++ b/erpnext/setup/doctype/company/delete_company_transactions.py
@@ -18,7 +18,6 @@ def delete_company_transactions(company_name):
 			frappe.PermissionError)

 	delete_bins(company_name)
-	delete_time_sheets(company_name)
 	delete_lead_addresses(company_name)

 	for doctype in frappe.db.sql_list("""select parent from
@@ -70,14 +69,6 @@ def delete_bins(company_name):
 	frappe.db.sql("""delete from tabBin where warehouse in
 			(select name from tabWarehouse where company=%s)""", company_name)

-def delete_time_sheets(company_name):
-	# Delete Time Logs as it is linked to Production Order / Project / Task, which are linked to company
-	frappe.db.sql("""
-		delete from `tabTimesheet`
-		where
-			company=%(company)s
-	""", {"company": company_name})
-
 def delete_lead_addresses(company_name):
 	"""Delete addresses to which leads are linked"""
 	for lead in frappe.get_all("Lead", filters={"company": company_name}):
--- a/erpnext/setup/doctype/naming_series/naming_series.py
+++ b/erpnext/setup/doctype/naming_series/naming_series.py
@@ -24,7 +24,7 @@ class NamingSeries(Document):
 			try:
 				options = self.get_options(d)
 			except frappe.DoesNotExistError:
-				frappe.pass_does_not_exist_error()
+				frappe.msgprint('Unable to find DocType {0}'.format(d))
 				continue

 			if options:
--- a/erpnext/setup/doctype/uom/uom.json
+++ b/erpnext/setup/doctype/uom/uom.json
@@ -1,7 +1,7 @@
 {
 "allow_copy": 0, 
 "allow_import": 1, 
- "allow_rename": 0, 
+ "allow_rename": 1, 
 "autoname": "field:uom_name", 
 "beta": 0, 
 "creation": "2013-01-10 16:34:24", 
@@ -15,6 +15,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "uom_name", 
   "fieldtype": "Data", 
   "hidden": 0, 
@@ -41,6 +42,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "Check this to disallow fractions. (for Nos)", 
   "fieldname": "must_be_whole_number", 
   "fieldtype": "Check", 
@@ -74,7 +76,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2016-07-25 05:24:25.434534", 
+ "modified": "2016-09-23 17:58:21.574996", 
 "modified_by": "Administrator", 
 "module": "Setup", 
 "name": "UOM", 
@@ -144,5 +146,6 @@
 "quick_entry": 1, 
 "read_only": 0, 
 "read_only_onload": 0, 
+ "sort_order": "ASC", 
 "track_seen": 0
 }
--- a/erpnext/setup/setup_wizard/domainify.py
+++ b/erpnext/setup/setup_wizard/domainify.py
@@ -63,7 +63,8 @@ def get_domain(domain):
 		'Education': {
 			'desktop_icons': ['Student', 'Program', 'Course', 'Student Group', 'Instructor',
 				'Fees',  'ToDo', 'Schools'],
-			'allow_roles': ['Academics User', 'Accounts User', 'Accounts Manager', 'Website Manager'],
+			'allow_roles': ['Academics User', 'Accounts User', 'Accounts Manager', 'Item Manager',
+				'Website Manager', 'HR User', 'HR Manager', 'Purchase User', 'Purchase Manager'],
 			'allow_sidebar_items': ['/announcement', '/course', '/assessment', '/fees']
 		},
 	}
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -3,16 +3,19 @@
 "allow_import": 1, 
 "allow_rename": 0, 
 "autoname": "naming_series:", 
+ "beta": 0, 
 "creation": "2013-05-24 19:29:09", 
 "custom": 0, 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Document", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "delivery_to_section", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -38,6 +41,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -64,6 +68,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "{customer_name}", 
   "fieldname": "title", 
   "fieldtype": "Data", 
@@ -90,6 +95,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "naming_series", 
   "fieldtype": "Select", 
   "hidden": 0, 
@@ -117,6 +123,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "customer", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -144,6 +151,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "customer", 
   "fieldname": "customer_name", 
   "fieldtype": "Data", 
@@ -169,6 +177,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -193,6 +202,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "amended_from", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -222,6 +232,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "", 
   "fieldname": "company", 
   "fieldtype": "Link", 
@@ -252,6 +263,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "Today", 
   "fieldname": "posting_date", 
   "fieldtype": "Date", 
@@ -281,6 +293,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "po_no", 
   "fieldtype": "Data", 
   "hidden": 0, 
@@ -309,6 +322,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.po_no", 
   "fieldname": "po_date", 
   "fieldtype": "Date", 
@@ -338,6 +352,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "is_return", 
   "fieldtype": "Check", 
   "hidden": 0, 
@@ -347,7 +362,7 @@
   "in_list_view": 0, 
   "label": "Is Return", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 1, 
@@ -363,6 +378,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "is_return", 
   "fieldname": "return_against", 
   "fieldtype": "Link", 
@@ -373,7 +389,7 @@
   "in_list_view": 0, 
   "label": "Return Against Delivery Note", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "options": "Delivery Note", 
   "permlevel": 0, 
   "precision": "", 
@@ -390,6 +406,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "depends_on": "customer", 
   "fieldname": "contact_info", 
   "fieldtype": "Section Break", 
@@ -416,6 +433,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "shipping_address_name", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -441,6 +459,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "shipping_address", 
   "fieldtype": "Small Text", 
   "hidden": 0, 
@@ -465,6 +484,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "contact_person", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -490,6 +510,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "contact_display", 
   "fieldtype": "Small Text", 
   "hidden": 0, 
@@ -514,6 +535,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "contact_mobile", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
@@ -538,6 +560,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "contact_email", 
   "fieldtype": "Data", 
   "hidden": 1, 
@@ -563,6 +586,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "col_break21", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -588,6 +612,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "customer", 
   "fieldname": "customer_address", 
   "fieldtype": "Link", 
@@ -614,6 +639,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "address_display", 
   "fieldtype": "Small Text", 
   "hidden": 0, 
@@ -638,6 +664,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "", 
   "fieldname": "customer_group", 
   "fieldtype": "Link", 
@@ -664,6 +691,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "", 
   "fieldname": "territory", 
   "fieldtype": "Link", 
@@ -690,6 +718,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "currency_and_price_list", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -715,6 +744,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "currency", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -742,6 +772,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "Rate at which customer's currency is converted to company's base currency", 
   "fieldname": "conversion_rate", 
   "fieldtype": "Float", 
@@ -770,6 +801,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "col_break23", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -793,6 +825,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "selling_price_list", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -820,6 +853,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "price_list_currency", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -845,6 +879,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "Rate at which Price list currency is converted to company's base currency", 
   "fieldname": "plc_conversion_rate", 
   "fieldtype": "Float", 
@@ -871,6 +906,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "ignore_pricing_rule", 
   "fieldtype": "Check", 
   "hidden": 0, 
@@ -895,6 +931,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "items_section", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -921,6 +958,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "items", 
   "fieldtype": "Table", 
   "hidden": 0, 
@@ -949,6 +987,7 @@
   "bold": 0, 
   "collapsible": 1, 
   "collapsible_depends_on": "packed_items", 
+   "columns": 0, 
   "fieldname": "packing_list", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -975,6 +1014,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "packed_items", 
   "fieldtype": "Table", 
   "hidden": 0, 
@@ -1002,6 +1042,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "product_bundle_help", 
   "fieldtype": "HTML", 
   "hidden": 0, 
@@ -1026,6 +1067,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "section_break_31", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1049,6 +1091,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_total", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1075,6 +1118,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_net_total", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1104,6 +1148,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_33", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -1127,6 +1172,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "total", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1153,6 +1199,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "net_total", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1178,6 +1225,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "taxes_section", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1204,6 +1252,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.", 
   "fieldname": "taxes_and_charges", 
   "fieldtype": "Link", 
@@ -1232,6 +1281,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_39", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -1255,6 +1305,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "shipping_rule", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -1281,6 +1332,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "section_break_41", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1304,6 +1356,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "taxes", 
   "fieldtype": "Table", 
   "hidden": 0, 
@@ -1331,6 +1384,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "other_charges_calculation", 
   "fieldtype": "HTML", 
   "hidden": 0, 
@@ -1356,6 +1410,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "section_break_44", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1379,6 +1434,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_total_taxes_and_charges", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1408,6 +1464,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_47", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -1432,6 +1489,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "total_taxes_and_charges", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1458,6 +1516,7 @@
   "bold": 0, 
   "collapsible": 1, 
   "collapsible_depends_on": "discount_amount", 
+   "columns": 0, 
   "fieldname": "section_break_49", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1483,6 +1542,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "Grand Total", 
   "fieldname": "apply_discount_on", 
   "fieldtype": "Select", 
@@ -1510,6 +1570,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_discount_amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1536,6 +1597,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_51", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -1559,6 +1621,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "additional_discount_percentage", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -1584,6 +1647,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "discount_amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1609,6 +1673,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "totals", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1635,6 +1700,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_grand_total", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1664,6 +1730,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_rounded_total", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1693,6 +1760,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "In Words will be visible once you save the Delivery Note.", 
   "fieldname": "base_in_words", 
   "fieldtype": "Data", 
@@ -1722,6 +1790,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break3", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -1746,6 +1815,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "grand_total", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1775,6 +1845,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "rounded_total", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1804,6 +1875,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "In Words (Export) will be visible once you save the Delivery Note.", 
   "fieldname": "in_words", 
   "fieldtype": "Data", 
@@ -1834,6 +1906,7 @@
   "bold": 0, 
   "collapsible": 1, 
   "collapsible_depends_on": "terms", 
+   "columns": 0, 
   "fieldname": "terms_section_break", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1860,6 +1933,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "tc_name", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -1887,6 +1961,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "terms", 
   "fieldtype": "Text Editor", 
   "hidden": 0, 
@@ -1914,6 +1989,7 @@
   "bold": 0, 
   "collapsible": 1, 
   "collapsible_depends_on": "transporter_name", 
+   "columns": 0, 
   "fieldname": "transporter_info", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1939,6 +2015,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "transporter_name", 
   "fieldtype": "Data", 
   "hidden": 0, 
@@ -1967,6 +2044,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "col_break34", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -1992,6 +2070,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "", 
   "fieldname": "lr_no", 
   "fieldtype": "Data", 
@@ -2021,6 +2100,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "Today", 
   "description": "", 
   "fieldname": "lr_date", 
@@ -2051,6 +2131,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "more_info", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -2077,6 +2158,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "Track this Delivery Note against any Project", 
   "fieldname": "project", 
   "fieldtype": "Link", 
@@ -2105,6 +2187,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:doc.source == 'Campaign'", 
   "fieldname": "campaign", 
   "fieldtype": "Link", 
@@ -2133,6 +2216,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "source", 
   "fieldtype": "Select", 
   "hidden": 0, 
@@ -2160,6 +2244,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break5", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -2186,6 +2271,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "Time at which items were delivered from warehouse", 
   "fieldname": "posting_time", 
   "fieldtype": "Time", 
@@ -2215,6 +2301,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "per_billed", 
   "fieldtype": "Percent", 
   "hidden": 0, 
@@ -2240,6 +2327,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "printing_details", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -2265,6 +2353,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "letter_head", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -2292,6 +2381,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "select_print_heading", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -2319,6 +2409,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "language", 
   "fieldtype": "Data", 
   "hidden": 0, 
@@ -2344,6 +2435,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_88", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -2368,6 +2460,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "print_without_amount", 
   "fieldtype": "Check", 
   "hidden": 0, 
@@ -2394,6 +2487,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "section_break_83", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -2418,6 +2512,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "Draft", 
   "fieldname": "status", 
   "fieldtype": "Select", 
@@ -2448,6 +2543,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "eval:!doc.__islocal", 
   "description": "% of materials delivered against this Delivery Note", 
   "fieldname": "per_installed", 
@@ -2476,6 +2572,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "installation_status", 
   "fieldtype": "Select", 
   "hidden": 1, 
@@ -2500,6 +2597,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_89", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -2523,6 +2621,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "Required only for sample item.", 
   "fieldname": "to_warehouse", 
   "fieldtype": "Link", 
@@ -2551,6 +2650,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "excise_page", 
   "fieldtype": "Data", 
   "hidden": 1, 
@@ -2577,6 +2677,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "instructions", 
   "fieldtype": "Text", 
   "hidden": 0, 
@@ -2604,6 +2705,7 @@
   "bold": 0, 
   "collapsible": 1, 
   "collapsible_depends_on": "total_commission", 
+   "columns": 0, 
   "fieldname": "sales_team_section_break", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -2630,6 +2732,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "sales_partner", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -2659,6 +2762,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break7", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -2684,6 +2788,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "commission_rate", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -2712,6 +2817,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "total_commission", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -2740,6 +2846,7 @@
   "bold": 0, 
   "collapsible": 0, 
   "collapsible_depends_on": "sales_team", 
+   "columns": 0, 
   "fieldname": "section_break1", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -2764,6 +2871,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "sales_team", 
   "fieldtype": "Table", 
   "hidden": 0, 
@@ -2792,6 +2900,7 @@
 "hide_toolbar": 0, 
 "icon": "icon-truck", 
 "idx": 146, 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 1, 
@@ -2799,7 +2908,7 @@
 "istable": 0, 
 "max_attachments": 0, 
 "menu_index": 0, 
- "modified": "2016-04-14 12:53:48.081945", 
+ "modified": "2016-09-23 18:01:54.003673", 
 "modified_by": "Administrator", 
 "module": "Stock", 
 "name": "Delivery Note", 
@@ -2906,6 +3015,7 @@
   "write": 1
  }
 ], 
+ "quick_entry": 0, 
 "read_only": 0, 
 "read_only_onload": 1, 
 "search_fields": "status,customer,customer_name, territory,base_grand_total", 
@@ -2914,4 +3024,4 @@
 "timeline_field": "customer", 
 "title_field": "title", 
 "track_seen": 0
-}
+}
--- a/erpnext/stock/doctype/material_request/material_request.py
+++ b/erpnext/stock/doctype/material_request/material_request.py
@@ -15,9 +15,9 @@ from erpnext.controllers.buying_controller import BuyingController
 from erpnext.manufacturing.doctype.production_order.production_order import get_item_details


-# form_grid_templates = {
-# 	"items": "templates/form_grid/material_request_grid.html"
-# }
+form_grid_templates = {
+	"items": "templates/form_grid/material_request_grid.html"
+}

 class MaterialRequest(BuyingController):
 	def get_feed(self):
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -9,11 +9,13 @@
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Document", 
+ "editable_grid": 1, 
 "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": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -65,6 +68,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "{supplier_name}", 
   "fieldname": "title", 
   "fieldtype": "Data", 
@@ -91,6 +95,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "", 
   "fieldname": "naming_series", 
   "fieldtype": "Select", 
@@ -119,6 +124,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "supplier", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -148,6 +154,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "supplier", 
   "fieldname": "supplier_name", 
   "fieldtype": "Data", 
@@ -173,6 +180,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -199,6 +207,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "Today", 
   "fieldname": "posting_date", 
   "fieldtype": "Date", 
@@ -228,6 +237,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "Time at which materials were received", 
   "fieldname": "posting_time", 
   "fieldtype": "Time", 
@@ -257,6 +267,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "", 
   "fieldname": "company", 
   "fieldtype": "Link", 
@@ -287,6 +298,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "is_return", 
   "fieldtype": "Check", 
   "hidden": 0, 
@@ -296,7 +308,7 @@
   "in_list_view": 0, 
   "label": "Is Return", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 1, 
@@ -312,6 +324,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "is_return", 
   "fieldname": "return_against", 
   "fieldtype": "Link", 
@@ -322,7 +335,7 @@
   "in_list_view": 0, 
   "label": "Return Against Purchase Receipt", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "options": "Purchase Receipt", 
   "permlevel": 0, 
   "precision": "", 
@@ -339,6 +352,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "section_addresses", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -364,6 +378,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "supplier_address", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -389,6 +404,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "contact_person", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -414,6 +430,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "", 
   "fieldname": "address_display", 
   "fieldtype": "Small Text", 
@@ -439,6 +456,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "contact_display", 
   "fieldtype": "Small Text", 
   "hidden": 0, 
@@ -463,6 +481,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "contact_mobile", 
   "fieldtype": "Small Text", 
   "hidden": 0, 
@@ -487,6 +506,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "contact_email", 
   "fieldtype": "Small Text", 
   "hidden": 0, 
@@ -511,6 +531,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "col_break_address", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -535,6 +556,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "", 
   "fieldname": "shipping_address", 
   "fieldtype": "Link", 
@@ -562,6 +584,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "shipping_address_display", 
   "fieldtype": "Small Text", 
   "hidden": 0, 
@@ -587,6 +610,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "currency_and_price_list", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -612,6 +636,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "currency", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -639,6 +664,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "Rate at which supplier's currency is converted to company's base currency", 
   "fieldname": "conversion_rate", 
   "fieldtype": "Float", 
@@ -667,6 +693,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break2", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -693,6 +720,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "buying_price_list", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -718,6 +746,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "buying_price_list", 
   "fieldname": "price_list_currency", 
   "fieldtype": "Link", 
@@ -744,6 +773,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "depends_on": "buying_price_list", 
   "fieldname": "plc_conversion_rate", 
   "fieldtype": "Float", 
@@ -770,6 +800,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "ignore_pricing_rule", 
   "fieldtype": "Check", 
   "hidden": 0, 
@@ -794,6 +825,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "items_section", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -820,6 +852,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "items", 
   "fieldtype": "Table", 
   "hidden": 0, 
@@ -847,6 +880,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "get_current_stock", 
   "fieldtype": "Button", 
   "hidden": 0, 
@@ -873,6 +907,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "section_break0", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -897,6 +932,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_total", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -923,6 +959,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_net_total", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -952,6 +989,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_27", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -975,6 +1013,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "total", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1001,6 +1040,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "net_total", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1028,6 +1068,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "Add / Edit Taxes and Charges", 
   "fieldname": "taxes_section", 
   "fieldtype": "Section Break", 
@@ -1055,6 +1096,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "", 
   "fieldname": "taxes_and_charges", 
   "fieldtype": "Link", 
@@ -1083,6 +1125,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "taxes", 
   "fieldtype": "Table", 
   "hidden": 0, 
@@ -1110,6 +1153,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "other_charges_calculation", 
   "fieldtype": "HTML", 
   "hidden": 0, 
@@ -1135,6 +1179,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "", 
   "fieldname": "totals", 
   "fieldtype": "Section Break", 
@@ -1162,6 +1207,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_taxes_and_charges_added", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1189,6 +1235,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_taxes_and_charges_deducted", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1216,6 +1263,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_total_taxes_and_charges", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1243,6 +1291,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break3", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -1268,6 +1317,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "taxes_and_charges_added", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1295,6 +1345,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "taxes_and_charges_deducted", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1322,6 +1373,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "total_taxes_and_charges", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1349,6 +1401,7 @@
   "bold": 0, 
   "collapsible": 1, 
   "collapsible_depends_on": "discount_amount", 
+   "columns": 0, 
   "fieldname": "section_break_42", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1374,6 +1427,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "Grand Total", 
   "fieldname": "apply_discount_on", 
   "fieldtype": "Select", 
@@ -1401,6 +1455,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_discount_amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1427,6 +1482,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_44", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -1451,6 +1507,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "additional_discount_percentage", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -1476,6 +1533,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "discount_amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1502,6 +1560,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "section_break_46", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1526,6 +1585,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_grand_total", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1553,6 +1613,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "", 
   "fieldname": "base_in_words", 
   "fieldtype": "Data", 
@@ -1580,6 +1641,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "base_rounded_total", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1607,6 +1669,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break_50", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -1631,6 +1694,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "grand_total", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1658,6 +1722,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "in_words", 
   "fieldtype": "Data", 
   "hidden": 0, 
@@ -1685,6 +1750,7 @@
   "bold": 0, 
   "collapsible": 1, 
   "collapsible_depends_on": "terms", 
+   "columns": 0, 
   "fieldname": "terms_section_break", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1711,6 +1777,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "tc_name", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -1738,6 +1805,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "terms", 
   "fieldtype": "Text Editor", 
   "hidden": 0, 
@@ -1765,6 +1833,7 @@
   "bold": 0, 
   "collapsible": 1, 
   "collapsible_depends_on": "supplied_items", 
+   "columns": 0, 
   "description": "", 
   "fieldname": "raw_material_details", 
   "fieldtype": "Section Break", 
@@ -1792,6 +1861,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "No", 
   "description": "", 
   "fieldname": "is_subcontracted", 
@@ -1821,6 +1891,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "", 
   "fieldname": "supplier_warehouse", 
   "fieldtype": "Link", 
@@ -1851,6 +1922,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "supplied_items", 
   "fieldtype": "Table", 
   "hidden": 0, 
@@ -1878,6 +1950,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "bill_no", 
   "fieldtype": "Data", 
   "hidden": 1, 
@@ -1904,6 +1977,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "bill_date", 
   "fieldtype": "Date", 
   "hidden": 1, 
@@ -1930,6 +2004,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "more_info", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1956,6 +2031,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "default": "Draft", 
   "fieldname": "status", 
   "fieldtype": "Select", 
@@ -1986,6 +2062,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", 
@@ -2014,6 +2091,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "amended_from", 
   "fieldtype": "Link", 
   "hidden": 1, 
@@ -2043,6 +2121,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "range", 
   "fieldtype": "Data", 
   "hidden": 1, 
@@ -2069,6 +2148,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break4", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -2095,6 +2175,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "per_billed", 
   "fieldtype": "Percent", 
   "hidden": 0, 
@@ -2120,6 +2201,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 1, 
+   "columns": 0, 
   "fieldname": "printing_settings", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -2145,6 +2227,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "letter_head", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -2170,6 +2253,7 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "select_print_heading", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -2197,6 +2281,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "language", 
   "fieldtype": "Data", 
   "hidden": 0, 
@@ -2222,6 +2307,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "other_details", 
   "fieldtype": "HTML", 
   "hidden": 1, 
@@ -2250,6 +2336,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "instructions", 
   "fieldtype": "Small Text", 
   "hidden": 0, 
@@ -2276,6 +2363,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "remarks", 
   "fieldtype": "Small Text", 
   "hidden": 0, 
@@ -2301,6 +2389,7 @@
   "bold": 0, 
   "collapsible": 1, 
   "collapsible_depends_on": "transporter_name", 
+   "columns": 0, 
   "fieldname": "transporter_info", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -2326,6 +2415,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "transporter_name", 
   "fieldtype": "Data", 
   "hidden": 0, 
@@ -2352,6 +2442,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "fieldname": "column_break5", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -2377,6 +2468,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "", 
   "fieldname": "lr_no", 
   "fieldtype": "Data", 
@@ -2406,6 +2498,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "columns": 0, 
   "description": "", 
   "fieldname": "lr_date", 
   "fieldtype": "Date", 
@@ -2444,7 +2537,7 @@
 "istable": 0, 
 "max_attachments": 0, 
 "menu_index": 0, 
- "modified": "2016-06-30 13:42:23.310309", 
+ "modified": "2016-09-23 18:02:17.332333", 
 "modified_by": "Administrator", 
 "module": "Stock", 
 "name": "Purchase Receipt", 
--- a/erpnext/stock/doctype/warehouse/warehouse.py
+++ b/erpnext/stock/doctype/warehouse/warehouse.py
@@ -71,7 +71,7 @@ class Warehouse(NestedSet):
 						"freeze_account": "No"
 					})
 					ac_doc.flags.ignore_permissions = True
-
+					ac_doc.flags.ignore_mandatory = True
 					try:
 						ac_doc.insert()
 						msgprint(_("Account head {0} created").format(ac_doc.name))
--- a/erpnext/stock/stock_balance.py
+++ b/erpnext/stock/stock_balance.py
@@ -230,7 +230,7 @@ def reset_serial_no_status_and_warehouse(serial_nos=None):
 				pass

 def repost_all_stock_vouchers():
-	warehouses_with_account = frappe.db.sql_list("""select master_name from tabAccount
+	warehouses_with_account = frappe.db.sql_list("""select warehouse from tabAccount
 		where ifnull(account_type, '') = 'Stock' and (warehouse is not null and warehouse != '')
 		and is_group=0""")

@@ -244,7 +244,7 @@ def repost_all_stock_vouchers():
 	i = 0
 	for voucher_type, voucher_no in vouchers:
 		i+=1
-		print i, "/", len(vouchers)
+		print i, "/", len(vouchers), voucher_type, voucher_no
 		try:
 			for dt in ["Stock Ledger Entry", "GL Entry"]:
 				frappe.db.sql("""delete from `tab%s` where voucher_type=%s and voucher_no=%s"""%
--- a/erpnext/templates/form_grid/material_request_grid.html
+++ b/erpnext/templates/form_grid/material_request_grid.html
@@ -0,0 +1,49 @@
+{% var visible_columns = row.get_visible_columns(["item_code", "warehouse",
+	"item_name", "amount", "stock_uom", "uom", "qty", "schedule_date"]); %}
+
+{% if(!doc) { %}
+	<div class="row">
+		<div class="col-sm-4">{%= __("Item") %}</div>
+		<div class="col-sm-3">{%= __("Required On") %}</div>
+		<div class="col-sm-3">{%= __("Warehouse") %}</div>
+		<div class="col-sm-2 text-right">{%= __("Qty") %}</div>
+	</div>
+{% } else { %}
+	<div class="row">
+		<div class="col-sm-4">
+            <span class="indicator {%= (doc.qty<=doc.ordered_qty) ? "green" : "orange" %}">{%= doc.item_code %}</strong>
+			{% if(doc.item_name != doc.item_code) { %}
+				<br>{%= doc.item_name %}{% } %}
+            <!-- {% if(doc.item_name != doc.description) { %}
+                <p>{%= doc.description %}</p>{% } %} -->
+			{% include "templates/form_grid/includes/visible_cols.html" %}
+		</div>
+
+
+		<div class="col-sm-3">
+			{% if(doc.schedule_date) { %}
+                <span title="{%= __("Reqd By Date") %}" class="{%=
+				(frappe.datetime.get_diff(doc.schedule_date, frappe.datetime.get_today()) < 0
+					&& doc.ordered_qty < doc.qty)
+					? "text-danger" : "text-muted" %}">
+					{%= doc.get_formatted("schedule_date") %}</span>
+			{% } %}
+        </div>
+
+        <!-- warehouse -->
+		<div class="col-sm-3">
+			{% if(doc.warehouse) { %}
+				<span class="label label-default" title="{%= __("For Warehouse") %}"
+                    style="margin-right: 10px;">
+					{%= doc.warehouse %}
+				</span>
+			{% } %}
+        </div>
+
+		<!-- qty -->
+		<div class="col-sm-2 text-right">
+			{%= doc.get_formatted("qty") %}
+			<span class="small">{%= doc.uom || doc.stock_uom %}</span>
+		</div>
+	</div>
+{% } %}
Author	SHA1	Message	Date
Nabin Hait	773d93b628	Merge branch 'hotfix'	2016-09-29 14:16:43 +05:30
Nabin Hait	626fcd5199	bumped to version 7.0.51	2016-09-29 14:46:42 +06:00
Nabin Hait	2c452a6881	Merge pull request #6485 from rohitwaghchaure/enhancement_payment_entry [Enhancement] Added allocate payment amount checkbox in Payment Entry	2016-09-29 13:57:48 +05:30
Nabin Hait	d0a25f72c7	Merge pull request #6488 from rohitwaghchaure/timesheet_delete_transaction_issue [Fix] Timesheet detail records not deleted with company transactions deletion	2016-09-29 13:55:38 +05:30
Nabin Hait	424bffc98b	Merge pull request #6486 from nabinhait/stock_trans_repost Reposting of GLE and SLE for all stock transactions	2016-09-29 13:51:51 +05:30
Nabin Hait	473ccc410b	Merge pull request #6489 from nabinhait/leave_application_fix [fix] Validate leave application period with salary slip only if leave type is LWP	2016-09-29 13:49:31 +05:30
Nabin Hait	b81a7538b9	Merge pull request #6492 from rohitwaghchaure/patch_for_change_amount_account [Fix] added account for missing change amount account in the sales invoice	2016-09-29 13:41:50 +05:30
Nabin Hait	a3ffe530f0	Merge pull request #6493 from nabinhait/ar_issue [fix] Accounts Receivable report if negative write off in invoice	2016-09-29 13:39:16 +05:30
Nabin Hait	f1d2fd2436	[fix] Accounts Receivable report if negative write off in invoice	2016-09-29 13:03:10 +05:30
Rohit Waghchaure	4b24683c27	[Fix] added account for missing change amount account in the sales invoice	2016-09-29 12:55:48 +05:30
Nabin Hait	2e31d7c7bf	[fix] Validate leave application period with salary slip only if leave type is LWP	2016-09-29 10:59:46 +05:30
Rohit Waghchaure	17adb970f1	[Fix] Timesheet detail records not deleted with company transactions deletion	2016-09-29 01:07:28 +05:30
Rohit Waghchaure	f21f1af0c9	[Enhancement] Added allocate payment amount checkbox in Payment Entry	2016-09-28 18:24:17 +05:30
Nabin Hait	b3bc41131e	Reposting of GLE and SLE for all stock transactions	2016-09-28 18:17:52 +05:30
Nabin Hait	f1ad32059f	Merge pull request #6481 from rohitwaghchaure/fix_homepage Fixed view button functionality in homepage	2016-09-28 16:57:21 +05:30
Nabin Hait	eba0d83541	Merge pull request #6482 from rohitwaghchaure/cash_flow_fix [Fix] sub-heading is missing in the excel sheet of the cash flow	2016-09-28 16:57:03 +05:30
Rohit Waghchaure	7441a93a10	[Fix] sub-heading is missing in the excel sheet of the cash flow	2016-09-28 14:57:57 +05:30
Rohit Waghchaure	d63bfaa5f2	Fixed view button functionality in homepage	2016-09-28 14:08:47 +05:30
Nabin Hait	a82358bb98	Merge pull request #6480 from rohitwaghchaure/patch_fix_timesheet Remove time log, time log batch from Doc Field.	2016-09-28 13:21:08 +05:30
Rohit Waghchaure	0a6529a643	Remove time log, time log batch from Doc Field.	2016-09-28 13:03:42 +05:30
Nabin Hait	63552166be	Merge branch 'hotfix'	2016-09-28 10:46:36 +05:30
Nabin Hait	147ecab6b0	bumped to version 7.0.50	2016-09-28 11:16:36 +06:00
Nabin Hait	45f05d2c9b	Merge pull request #6465 from saurabh6790/hotfix [fix] ledger view from coa	2016-09-28 10:44:40 +05:30
Nabin Hait	2b6cacc799	Merge branch 'hotfix'	2016-09-26 18:02:19 +05:30
Nabin Hait	577aa9cb33	bumped to version 7.0.49	2016-09-26 18:32:19 +06:00
Nabin Hait	ad3e213b41	minor patch fixes	2016-09-26 18:00:13 +05:30
Nabin Hait	7faa4b5fdf	Merge pull request #6455 from rohitwaghchaure/retun_field_duplicate_issue [Fix] Allow renaming for UOM, When Duplicate Is Return field should not be copied #5510 #6288	2016-09-26 17:57:28 +05:30
Nabin Hait	f04721ee79	Update naming_series.py	2016-09-26 17:55:34 +05:30
Saurabh	5874a76eac	[fix] ledger view from coa	2016-09-26 16:14:15 +05:30
Pawan Mehta	4f72480045	Merge pull request #6453 from PawanMeh/hotfix [fix]-Ageing buckets should not have amounts if due date is not reached	2016-09-23 22:52:00 +05:30
Rohit Waghchaure	d728f5a429	[Fix] Allow renaming for UOM, When Duplicate Is Return field should not be copied #5510 #6288	2016-09-23 18:06:24 +05:30
Nabin Hait	5f0aceab19	Merge branch 'hotfix'	2016-09-23 17:23:28 +05:30
Nabin Hait	aec28a2c88	bumped to version 7.0.48	2016-09-23 17:53:28 +06:00
pawan	09f1ee637e	[fix] #6371	2016-09-23 17:19:54 +05:30
Nabin Hait	3720045eb9	Update patches.txt	2016-09-23 16:31:43 +05:30
Nabin Hait	147b288d66	Update repost_gle_for_pos_sales_return.py	2016-09-23 13:11:05 +05:30
Nabin Hait	d4321ec18b	Merge branch 'hotfix'	2016-09-23 12:16:02 +05:30
Nabin Hait	84fa3dfac8	bumped to version 7.0.47	2016-09-23 12:46:01 +06:00
Nabin Hait	aca857e708	Merge pull request #6447 from nabinhait/patch_fix_legacy_migration Patch fixed for legacy migration	2016-09-23 12:15:06 +05:30
Nabin Hait	d03087d3ab	Patch fixed for legacy migration	2016-09-23 11:08:02 +05:30
Nabin Hait	4ed0653c7f	Merge pull request #6444 from rohitwaghchaure/supplier_status_issue [fix] Supplier status stuck at Open forever	2016-09-22 18:52:26 +05:30
Rohit Waghchaure	b2382c0b8e	[fix] Supplier status stuck at Open forever	2016-09-22 18:45:24 +05:30
Nabin Hait	f79b3f8c3c	Merge pull request #6443 from rohitwaghchaure/pos_discount_issue [POS] minor fix	2016-09-22 18:00:55 +05:30
Rohit Waghchaure	481ca832b0	minor fix	2016-09-22 17:21:37 +05:30
Nabin Hait	22e1665244	Merge pull request #6440 from rohitwaghchaure/additional_discount_amount_issue [Fix] Additional Discount Amount can't be refresh automatically #6199	2016-09-22 16:03:00 +05:30
Rohit Waghchaure	deaee7c08b	[Fix] Additional Discount Amount can't be refresh automatically #6199	2016-09-22 14:02:53 +05:30
Nabin Hait	0d36862917	Merge pull request #6434 from rohitwaghchaure/net_rate_issue [Fix] Discount copied during making of PO from SO	2016-09-22 12:34:08 +05:30
Rohit Waghchaure	bd599b0169	[Fix] Discount copied during making of PO from SO	2016-09-22 11:47:17 +05:30
Nabin Hait	0967b17320	Merge branch 'hotfix'	2016-09-22 11:33:32 +05:30
Nabin Hait	b1041072a2	bumped to version 7.0.46	2016-09-22 12:03:32 +06:00
Nabin Hait	a58a65457f	Sales Register report minor fix	2016-09-22 11:31:42 +05:30
Nabin Hait	993d7ca630	Merge pull request #6424 from rohitwaghchaure/daily_timesheet_summary_permission_issue [Fix] Daily timesheet summary permission issue	2016-09-21 18:41:54 +05:30
Nabin Hait	7108991039	Patch order changed	2016-09-21 16:34:44 +05:30
Rohit Waghchaure	342ec18b83	[Fix] Daily timesheet summary permission issue	2016-09-21 13:22:15 +05:30
Nabin Hait	6835a6fb49	Merge branch 'hotfix'	2016-09-21 13:05:26 +05:30
Nabin Hait	4fead63419	bumped to version 7.0.45	2016-09-21 13:35:26 +06:00
Nabin Hait	06131dd0b1	Merge pull request #6420 from nabinhait/sales_reg_fix Fix in Sales Register for multiple mode of payments	2016-09-21 12:54:25 +05:30
Nabin Hait	aac32d644d	Fix in Sales Register for multiple mode of payments	2016-09-21 11:46:07 +05:30
Nabin Hait	d12990ff57	Update update_home_page.py	2016-09-20 18:20:58 +05:30
Nabin Hait	429a38f90b	Merge pull request #6415 from rmehta/hotfix [minor] bring back old grid style in material request	2016-09-20 18:05:32 +05:30
Rushabh Mehta	57a1905576	[minor] bring back old grid style in material request	2016-09-20 17:22:54 +05:30