Merge branch 'develop'

bumped to version 6.11.2
[hotfix] total amount in journal entry
2015-11-27 17:24:49 +05:30 · 2015-11-27 17:54:49 +06:00 · 2015-11-27 17:24:06 +05:30 · 2015-11-27 15:08:57 +05:30 · 2015-11-27 15:38:57 +06:00 · 2015-11-27 15:08:36 +05:30
355 changed files with 33052 additions and 32773 deletions
--- a/erpnext/version.py
+++ b/erpnext/version.py
@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.9.2'
+__version__ = '6.11.2'
--- a/erpnext/accounts/doctype/account/account.json
+++ b/erpnext/accounts/doctype/account/account.json
@@ -20,6 +20,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "permlevel": 0, 
@@ -41,6 +42,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -63,6 +65,7 @@
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Account Name", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "account_name", 
   "oldfieldtype": "Data", 
@@ -87,6 +90,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Is Group", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -109,6 +113,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Company", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "company", 
   "oldfieldtype": "Link", 
@@ -132,7 +137,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Root Type",  
+   "label": "Root Type", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "\nAsset\nLiability\nIncome\nExpense\nEquity", 
   "permlevel": 0, 
@@ -154,7 +160,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Report Type",  
+   "label": "Report Type", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "\nBalance Sheet\nProfit and Loss", 
   "permlevel": 0, 
@@ -178,6 +185,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Currency", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Currency", 
   "permlevel": 0, 
@@ -200,6 +208,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -222,6 +231,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Parent Account", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "parent_account", 
   "oldfieldtype": "Link", 
@@ -246,7 +256,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 1, 
   "in_list_view": 0, 
-   "label": "Account Type",  
+   "label": "Account Type", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "account_type", 
   "oldfieldtype": "Select", 
@@ -272,6 +283,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "tax_rate", 
   "oldfieldtype": "Currency", 
@@ -295,7 +307,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Frozen",  
+   "label": "Frozen", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "freeze_account", 
   "oldfieldtype": "Select", 
@@ -320,6 +333,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Warehouse", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Warehouse", 
   "permlevel": 0, 
@@ -341,7 +355,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Balance must be",  
+   "label": "Balance must be", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "\nDebit\nCredit", 
   "permlevel": 0, 
@@ -364,6 +379,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Lft", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -385,6 +401,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Rgt", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -406,6 +423,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Old Parent", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -426,7 +444,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2015-10-02 07:38:37.436071", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:41.535663", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Account", 
--- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js
+++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js
@@ -2,10 +2,29 @@
 // License: GNU General Public License v3. See license.txt

 frappe.ui.form.on("Bank Reconciliation", {
+	setup: function(frm) {
+		frm.get_docfield("journal_entries").allow_bulk_edit = 1;
+		frm.add_fetch("bank_account", "company", "company");
+	},
+
+	onload: function(frm) {
+		frm.set_query("bank_account", function() {
+			return {
+				"filters": {
+					"account_type": "Bank",
+					"is_group": 0
+				}
+			};
+		});
+
+		frm.set_value("from_date", frappe.datetime.month_start());
+		frm.set_value("to_date", frappe.datetime.month_end());
+	},
+
 	refresh: function(frm) {
 		frm.disable_save();
 	},
-	
+
 	update_clearance_date: function(frm) {
 		return frappe.call({
 			method: "update_details",
@@ -22,19 +41,3 @@ frappe.ui.form.on("Bank Reconciliation", {
 		});
 	}
 });
-
-cur_frm.cscript.onload = function(doc, cdt, cdn) {
-	cur_frm.add_fetch("bank_account", "company", "company");
-
-	cur_frm.set_query("bank_account", function() {
-		return {
-			"filters": {
-				"account_type": "Bank",
-				"is_group": 0
-			}
-		};
-	});
-
-	cur_frm.set_value("from_date", frappe.datetime.month_start());
-	cur_frm.set_value("to_date", frappe.datetime.month_end());
-}
--- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
+++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
@@ -15,7 +15,7 @@ class BankReconciliation(Document):

 		condition = ""
 		if not self.include_reconciled_entries:
-			condition = "and ifnull(clearance_date, '') in ('', '0000-00-00')"
+			condition = "and (clearance_date is null or clearance_date='0000-00-00')"


 		dl = frappe.db.sql("""select t1.name, t1.cheque_no, t1.cheque_date, t2.debit,
--- a/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json
+++ b/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json
@@ -18,6 +18,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Voucher ID", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "voucher_id", 
   "oldfieldtype": "Link", 
@@ -42,6 +43,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Clearance Date", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "clearance_date", 
   "oldfieldtype": "Date", 
@@ -65,6 +67,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Against Account", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "against_account", 
   "oldfieldtype": "Data", 
@@ -88,6 +91,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Cheque Number", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "cheque_number", 
   "oldfieldtype": "Data", 
@@ -111,6 +115,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Debit", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "debit", 
   "oldfieldtype": "Currency", 
@@ -135,6 +140,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Credit", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "credit", 
   "oldfieldtype": "Currency", 
@@ -159,6 +165,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Reference Type", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "DocType", 
   "permlevel": 0, 
@@ -182,6 +189,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Reference Name", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "reference_type", 
   "permlevel": 0, 
@@ -205,6 +213,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Posting Date", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "posting_date", 
   "oldfieldtype": "Date", 
@@ -228,6 +237,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Cheque Date", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "cheque_date", 
   "oldfieldtype": "Date", 
@@ -249,7 +259,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 1, 
- "modified": "2015-10-02 07:38:39.149782", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:42.254366", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Bank Reconciliation Detail", 
--- a/erpnext/accounts/doctype/budget_detail/budget_detail.json
+++ b/erpnext/accounts/doctype/budget_detail/budget_detail.json
@@ -19,6 +19,7 @@
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Account", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "account", 
   "oldfieldtype": "Link", 
@@ -43,6 +44,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Budget Allocated", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "budget_allocated", 
   "oldfieldtype": "Currency", 
@@ -67,6 +69,7 @@
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Fiscal Year", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "fiscal_year", 
   "oldfieldtype": "Select", 
@@ -89,7 +92,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 1, 
- "modified": "2015-10-02 07:38:40.727468", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:43.050558", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Budget Detail", 
--- a/erpnext/accounts/doctype/c_form/c_form.json
+++ b/erpnext/accounts/doctype/c_form/c_form.json
@@ -18,6 +18,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -40,7 +41,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Series",  
+   "label": "Series", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "C-FORM-", 
   "permlevel": 0, 
@@ -63,6 +65,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "C-Form No", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -84,6 +87,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Received Date", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -105,6 +109,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Customer", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Customer", 
   "permlevel": 0, 
@@ -126,6 +131,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -149,6 +155,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Company", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company", 
   "permlevel": 0, 
@@ -171,6 +178,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Fiscal Year", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Fiscal Year", 
   "permlevel": 0, 
@@ -192,7 +200,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Quarter",  
+   "label": "Quarter", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "\nI\nII\nIII\nIV", 
   "permlevel": 0, 
@@ -215,6 +224,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -237,6 +247,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "State", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -257,6 +268,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -278,6 +290,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Invoices", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "C-Form Invoice Detail", 
   "permlevel": 0, 
@@ -300,6 +313,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total Invoiced Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -322,6 +336,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Amended From", 
+   "length": 0, 
   "no_copy": 1, 
   "options": "C-Form", 
   "permlevel": 0, 
@@ -344,7 +359,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 3, 
- "modified": "2015-10-02 07:38:40.926061", 
+ "modified": "2015-11-16 06:29:43.143528", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "C-Form", 
--- a/erpnext/accounts/doctype/c_form/test_c_form.py
+++ b/erpnext/accounts/doctype/c_form/test_c_form.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('C-Form')
+
+class TestCForm(unittest.TestCase):
+	pass
--- a/erpnext/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.json
+++ b/erpnext/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.json
@@ -18,6 +18,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Invoice No", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Sales Invoice", 
   "permlevel": 0, 
@@ -42,6 +43,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Invoice Date", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -66,6 +68,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Territory", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Territory", 
   "permlevel": 0, 
@@ -90,6 +93,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Net Total", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -114,6 +118,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Grand Total", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -136,7 +141,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 1, 
- "modified": "2015-10-02 07:38:41.105885", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:43.221484", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "C-Form Invoice Detail", 
--- a/erpnext/accounts/doctype/cost_center/cost_center.json
+++ b/erpnext/accounts/doctype/cost_center/cost_center.json
@@ -21,6 +21,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -42,6 +43,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Cost Center Name", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "cost_center_name", 
   "oldfieldtype": "Data", 
@@ -65,6 +67,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Parent Cost Center", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "parent_cost_center", 
   "oldfieldtype": "Link", 
@@ -89,6 +92,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Company", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "company_name", 
   "oldfieldtype": "Link", 
@@ -112,6 +116,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -135,6 +140,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Is Group", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -158,6 +164,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Budget", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -180,6 +187,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Distribution Id", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "distribution_id", 
   "oldfieldtype": "Link", 
@@ -205,6 +213,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Budgets", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "budget_details", 
   "oldfieldtype": "Table", 
@@ -229,6 +238,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "lft", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "lft", 
   "oldfieldtype": "Int", 
@@ -252,6 +262,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "rgt", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "rgt", 
   "oldfieldtype": "Int", 
@@ -275,6 +286,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "old_parent", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "old_parent", 
   "oldfieldtype": "Data", 
@@ -298,7 +310,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2015-10-02 07:38:42.617993", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:43.870712", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Cost Center", 
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
@@ -22,6 +22,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Year Name", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "year", 
   "oldfieldtype": "Data", 
@@ -45,6 +46,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Disabled", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -67,6 +69,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Year Start Date", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "year_start_date", 
   "oldfieldtype": "Date", 
@@ -90,6 +93,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Year End Date", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -111,6 +115,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Companies", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Fiscal Year Company", 
   "permlevel": 0, 
@@ -133,7 +138,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2015-10-02 07:38:50.942038", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:47.289982", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Fiscal Year", 
--- a/erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.json
+++ b/erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.json
@@ -19,6 +19,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Company", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company", 
   "permlevel": 0, 
@@ -39,7 +40,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 1, 
- "modified": "2015-10-02 07:38:51.045350", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:47.344839", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Fiscal Year Company", 
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.json
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.json
@@ -19,6 +19,7 @@
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Posting Date", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "posting_date", 
   "oldfieldtype": "Date", 
@@ -42,6 +43,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Transaction Date", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "transaction_date", 
   "oldfieldtype": "Date", 
@@ -65,6 +67,7 @@
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Account", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "account", 
   "oldfieldtype": "Link", 
@@ -89,6 +92,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Party Type", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "DocType", 
   "permlevel": 0, 
@@ -111,6 +115,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Party", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "party_type", 
   "permlevel": 0, 
@@ -133,6 +138,7 @@
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Cost Center", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "cost_center", 
   "oldfieldtype": "Link", 
@@ -157,6 +163,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Debit Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "debit", 
   "oldfieldtype": "Currency", 
@@ -182,6 +189,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Credit Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "credit", 
   "oldfieldtype": "Currency", 
@@ -207,6 +215,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Account Currency", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Currency", 
   "permlevel": 0, 
@@ -230,6 +239,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Debit Amount in Account Currency", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "currency", 
   "permlevel": 0, 
@@ -253,6 +263,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Credit Amount in Account Currency", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "currency", 
   "permlevel": 0, 
@@ -276,6 +287,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Against", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "against", 
   "oldfieldtype": "Text", 
@@ -299,6 +311,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Against Voucher Type", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "against_voucher_type", 
   "oldfieldtype": "Data", 
@@ -323,6 +336,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Against Voucher", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "against_voucher", 
   "oldfieldtype": "Data", 
@@ -347,6 +361,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Voucher Type", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "voucher_type", 
   "oldfieldtype": "Select", 
@@ -371,6 +386,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Voucher No", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "voucher_no", 
   "oldfieldtype": "Data", 
@@ -395,6 +411,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Remarks", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "remarks", 
   "oldfieldtype": "Text", 
@@ -418,6 +435,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Is Opening", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "is_opening", 
   "oldfieldtype": "Select", 
@@ -442,6 +460,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Is Advance", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "is_advance", 
   "oldfieldtype": "Select", 
@@ -466,6 +485,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Fiscal Year", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "fiscal_year", 
   "oldfieldtype": "Select", 
@@ -490,6 +510,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Company", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "company", 
   "oldfieldtype": "Link", 
@@ -513,7 +534,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2015-10-20 12:10:59.771050", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:47.382225", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "GL Entry", 
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.py
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.py
@@ -120,7 +120,7 @@ def validate_balance_type(account, adv_adj=False):
 	if not adv_adj and account:
 		balance_must_be = frappe.db.get_value("Account", account, "balance_must_be")
 		if balance_must_be:
-			balance = frappe.db.sql("""select sum(ifnull(debit, 0)) - sum(ifnull(credit, 0))
+			balance = frappe.db.sql("""select sum(debit) - sum(credit)
 				from `tabGL Entry` where account = %s""", account)[0][0]

 			if (balance_must_be=="Debit" and flt(balance) < 0) or \
@@ -142,14 +142,14 @@ def check_freezing_date(posting_date, adv_adj=False):

 def update_outstanding_amt(account, party_type, party, against_voucher_type, against_voucher, on_cancel=False):
 	if party_type and party:
-		party_condition = " and ifnull(party_type, '')='{0}' and ifnull(party, '')='{1}'"\
+		party_condition = " and party_type='{0}' and party='{1}'"\
 			.format(frappe.db.escape(party_type), frappe.db.escape(party))
 	else:
 		party_condition = ""

 	# get final outstanding amt
 	bal = flt(frappe.db.sql("""
-		select sum(ifnull(debit_in_account_currency, 0)) - sum(ifnull(credit_in_account_currency, 0))
+		select sum(debit_in_account_currency) - sum(credit_in_account_currency)
 		from `tabGL Entry`
 		where against_voucher_type=%s and against_voucher=%s
 		and account = %s {0}""".format(party_condition),
@@ -159,9 +159,9 @@ def update_outstanding_amt(account, party_type, party, against_voucher_type, aga
 		bal = -bal
 	elif against_voucher_type == "Journal Entry":
 		against_voucher_amount = flt(frappe.db.sql("""
-			select sum(ifnull(debit_in_account_currency, 0)) - sum(ifnull(credit_in_account_currency, 0))
+			select sum(debit_in_account_currency) - sum(credit_in_account_currency)
 			from `tabGL Entry` where voucher_type = 'Journal Entry' and voucher_no = %s
-			and account = %s and ifnull(against_voucher, '') = '' {0}"""
+			and account = %s and (against_voucher is null or against_voucher='') {0}"""
 			.format(party_condition), (against_voucher, account))[0][0])

 		if not against_voucher_amount:
--- a/erpnext/accounts/doctype/gl_entry/test_gl_entry.py
+++ b/erpnext/accounts/doctype/gl_entry/test_gl_entry.py
@@ -9,17 +9,17 @@ class TestGLEntry(unittest.TestCase):
 	def test_round_off_entry(self):
 		frappe.db.set_value("Company", "_Test Company", "round_off_account", "_Test Write Off - _TC")
 		frappe.db.set_value("Company", "_Test Company", "round_off_cost_center", "_Test Cost Center - _TC")
-		
-		jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC", 
+
+		jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC", 100, "_Test Cost Center - _TC", submit=False)
-			
+
 		jv.get("accounts")[0].debit = 100.01
 		jv.flags.ignore_validate = True
 		jv.submit()
-		
+
 		round_off_entry = frappe.db.sql("""select name from `tabGL Entry`
-			where voucher_type='Journal Entry' and voucher_no = %s 
+			where voucher_type='Journal Entry' and voucher_no = %s
 			and account='_Test Write Off - _TC' and cost_center='_Test Cost Center - _TC'
-			and ifnull(debit, 0) = 0 and ifnull(credit, 0) = '.01'""", jv.name)
-			
-		self.assertTrue(round_off_entry)
+			and debit = 0 and credit = '.01'""", jv.name)
+
+		self.assertTrue(round_off_entry)
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.json
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.json
@@ -19,6 +19,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "icon-flag", 
   "permlevel": 0, 
@@ -42,6 +43,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Title", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "precision": "", 
@@ -64,7 +66,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 1, 
   "in_list_view": 0, 
-   "label": "Entry Type",  
+   "label": "Entry Type", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "voucher_type", 
   "oldfieldtype": "Select", 
@@ -88,7 +91,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Series",  
+   "label": "Series", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "naming_series", 
   "oldfieldtype": "Select", 
@@ -112,6 +116,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
@@ -135,6 +140,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Posting Date", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "posting_date", 
   "oldfieldtype": "Date", 
@@ -158,6 +164,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-table", 
@@ -181,6 +188,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Accounting Entries", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "entries", 
   "oldfieldtype": "Table", 
@@ -204,6 +212,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -226,6 +235,7 @@
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Reference Number", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "cheque_no", 
   "oldfieldtype": "Data", 
@@ -249,6 +259,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Reference Date", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "cheque_date", 
   "oldfieldtype": "Date", 
@@ -272,6 +283,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "User Remark", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "user_remark", 
   "oldfieldtype": "Small Text", 
@@ -294,6 +306,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -315,6 +328,7 @@
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Total Debit", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "total_debit", 
   "oldfieldtype": "Currency", 
@@ -339,6 +353,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Total Credit", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "total_credit", 
   "oldfieldtype": "Currency", 
@@ -364,6 +379,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Difference (Dr - Cr)", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "difference", 
   "oldfieldtype": "Currency", 
@@ -389,6 +405,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Make Difference Entry", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Button", 
   "permlevel": 0, 
@@ -411,6 +428,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Multi Currency", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -433,6 +451,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total Amount", 
+   "length": 0, 
   "no_copy": 1, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -455,6 +474,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total Amount in Words", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -476,6 +496,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Reference", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "icon-pushpin", 
   "permlevel": 0, 
@@ -498,6 +519,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Clearance Date", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "clearance_date", 
   "oldfieldtype": "Date", 
@@ -522,6 +544,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Remark", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "remark", 
   "oldfieldtype": "Small Text", 
@@ -544,6 +567,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -565,6 +589,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Bill No", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "bill_no", 
   "oldfieldtype": "Data", 
@@ -588,6 +613,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Bill Date", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "bill_date", 
   "oldfieldtype": "Date", 
@@ -611,6 +637,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Due Date", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "due_date", 
   "oldfieldtype": "Date", 
@@ -635,6 +662,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Write Off", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -658,7 +686,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Write Off Based On",  
+   "label": "Write Off Based On", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Accounts Receivable\nAccounts Payable", 
   "permlevel": 0, 
@@ -682,6 +711,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Get Outstanding Invoices", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "get_outstanding_invoices", 
   "permlevel": 0, 
@@ -703,6 +733,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -726,6 +757,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Write Off Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -748,6 +780,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Printing Settings", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -770,6 +803,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Pay To / Recd From", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -790,6 +824,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -812,6 +847,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Letter Head", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Letter Head", 
   "permlevel": 0, 
@@ -834,6 +870,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Print Heading", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "select_print_heading", 
   "oldfieldtype": "Link", 
@@ -858,6 +895,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "More Information", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-file-text", 
@@ -881,6 +919,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Company", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "company", 
   "oldfieldtype": "Link", 
@@ -905,6 +944,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Fiscal Year", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "fiscal_year", 
   "oldfieldtype": "Select", 
@@ -928,6 +968,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
@@ -952,7 +993,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 1, 
   "in_list_view": 0, 
-   "label": "Is Opening",  
+   "label": "Is Opening", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "is_opening", 
   "oldfieldtype": "Select", 
@@ -978,6 +1020,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Stock Entry", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Stock Entry", 
   "permlevel": 0, 
@@ -1001,6 +1044,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Amended From", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "amended_from", 
   "oldfieldtype": "Link", 
@@ -1024,7 +1068,8 @@
 "is_submittable": 1, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2015-10-02 07:38:54.074343", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:48.813805", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Journal Entry", 
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -2,7 +2,7 @@
 # License: GNU General Public License v3. See license.txt

 from __future__ import unicode_literals
-import frappe
+import frappe, json
 from frappe.utils import cstr, flt, fmt_money, formatdate
 from frappe import msgprint, _, scrub
 from erpnext.controllers.accounts_controller import AccountsController
@@ -28,7 +28,7 @@ class JournalEntry(AccountsController):
 		self.validate_entries_for_advance()
 		self.validate_multi_currency()
 		self.set_amounts_in_company_currency()
-		self.validate_debit_and_credit()
+		self.validate_total_debit_and_credit()
 		self.validate_against_jv()
 		self.validate_reference_doc()
 		self.set_against_account()
@@ -121,7 +121,7 @@ class JournalEntry(AccountsController):

 				against_entries = frappe.db.sql("""select * from `tabJournal Entry Account`
 					where account = %s and docstatus = 1 and parent = %s
-					and ifnull(reference_type, '') in ("", "Sales Order", "Purchase Order")
+					and (reference_type is null or reference_type in ("", "Sales Order", "Purchase Order"))
 					""", (d.account, d.reference_name), as_dict=True)

 				if not against_entries:
@@ -252,7 +252,13 @@ class JournalEntry(AccountsController):
 			if flt(d.debit > 0): d.against_account = ", ".join(list(set(accounts_credited)))
 			if flt(d.credit > 0): d.against_account = ", ".join(list(set(accounts_debited)))

-	def validate_debit_and_credit(self):
+	def validate_total_debit_and_credit(self):
+		self.set_total_debit_credit()
+		if self.difference:
+			frappe.throw(_("Total Debit must be equal to Total Credit. The difference is {0}")
+				.format(self.difference))
+
+	def set_total_debit_credit(self):
 		self.total_debit, self.total_credit, self.difference = 0, 0, 0
 		for d in self.get("accounts"):
 			if d.debit and d.credit:
@@ -264,10 +270,6 @@ class JournalEntry(AccountsController):
 		self.difference = flt(self.total_debit, self.precision("total_debit")) - \
 			flt(self.total_credit, self.precision("total_credit"))

-		if self.difference:
-			frappe.throw(_("Total Debit must be equal to Total Credit. The difference is {0}")
-				.format(self.difference))
-
 	def validate_multi_currency(self):
 		alternate_currency = []
 		for d in self.get("accounts"):
@@ -283,7 +285,7 @@ class JournalEntry(AccountsController):
 				frappe.throw(_("Please check Multi Currency option to allow accounts with other currency"))

 		self.set_exchange_rate()
-	
+
 	def set_amounts_in_company_currency(self):
 		for d in self.get("accounts"):
 			d.debit = flt(flt(d.debit_in_account_currency)*flt(d.exchange_rate), d.precision("debit"))
@@ -337,15 +339,17 @@ class JournalEntry(AccountsController):
 			self.remark = ("\n").join(r) #User Remarks is not mandatory

 	def set_print_format_fields(self):
+		total_amount = 0.0
 		for d in self.get('accounts'):
 			if d.party_type and d.party:
 				if not self.pay_to_recd_from:
 					self.pay_to_recd_from = frappe.db.get_value(d.party_type, d.party,
 						"customer_name" if d.party_type=="Customer" else "supplier_name")

-					self.set_total_amount(d.debit or d.credit)
 			elif frappe.db.get_value("Account", d.account, "account_type") in ["Bank", "Cash"]:
-				self.set_total_amount(d.debit or d.credit)
+				total_amount += (d.debit_in_account_currency or d.credit_in_account_currency)
+
+		self.set_total_amount(total_amount)

 	def set_total_amount(self, amt):
 		self.total_amount = amt
@@ -404,7 +408,7 @@ class JournalEntry(AccountsController):
 					blank_row.debit_in_account_currency = abs(diff)
 					blank_row.debit = abs(diff)

-			self.validate_debit_and_credit()
+			self.validate_total_debit_and_credit()

 	def get_outstanding_invoices(self):
 		self.set('accounts', [])
@@ -432,7 +436,7 @@ class JournalEntry(AccountsController):
 		elif self.write_off_based_on == 'Accounts Payable':
 			jd2.credit = total

-		self.validate_debit_and_credit()
+		self.validate_total_debit_and_credit()


 	def get_values(self):
@@ -520,14 +524,14 @@ def get_default_bank_cash_account(company, voucher_type, mode_of_payment=None):
 			"account_currency": account_details.account_currency,
 			"account_type": account_details.account_type
 		}
-		
+
@frappe.whitelist()
 def get_payment_entry_against_order(dt, dn):
 	ref_doc = frappe.get_doc(dt, dn)
-	
+
 	if flt(ref_doc.per_billed, 2) > 0:
 		frappe.throw(_("Can only make payment against unbilled {0}").format(dt))
-		
+
 	if dt == "Sales Order":
 		party_type = "Customer"
 		amount_field_party = "credit_in_account_currency"
@@ -536,15 +540,15 @@ def get_payment_entry_against_order(dt, dn):
 		party_type = "Supplier"
 		amount_field_party = "debit_in_account_currency"
 		amount_field_bank = "credit_in_account_currency"
-		
+
 	party_account = get_party_account(party_type, ref_doc.get(party_type.lower()), ref_doc.company)
 	party_account_currency = get_account_currency(party_account)
-	
+
 	if party_account_currency == ref_doc.company_currency:
 		amount = flt(ref_doc.base_grand_total) - flt(ref_doc.advance_paid)
 	else:
 		amount = flt(ref_doc.grand_total) - flt(ref_doc.advance_paid)
-		
+
 	return get_payment_entry(ref_doc, {
 		"party_type": party_type,
 		"party_account": party_account,
@@ -555,35 +559,40 @@ def get_payment_entry_against_order(dt, dn):
 		"remarks": 'Advance Payment received against {0} {1}'.format(dt, dn),
 		"is_advance": "Yes"
 	})
-	
+
@frappe.whitelist()
 def get_payment_entry_against_invoice(dt, dn):
 	ref_doc = frappe.get_doc(dt, dn)
 	if dt == "Sales Invoice":
 		party_type = "Customer"
 		party_account = ref_doc.debit_to
-		amount_field_party = "credit_in_account_currency"
-		amount_field_bank = "debit_in_account_currency"
 	else:
 		party_type = "Supplier"
 		party_account = ref_doc.credit_to
+
+
+	if (dt=="Sales Invoice" and ref_doc.outstanding_amount > 0) \
+		or (dt=="Purchase Invoice" and ref_doc.outstanding_amount < 0):
+			amount_field_party = "credit_in_account_currency"
+			amount_field_bank = "debit_in_account_currency"
+	else:
 		amount_field_party = "debit_in_account_currency"
 		amount_field_bank = "credit_in_account_currency"
-		
+
 	return get_payment_entry(ref_doc, {
 		"party_type": party_type,
 		"party_account": party_account,
 		"party_account_currency": ref_doc.party_account_currency,
 		"amount_field_party": amount_field_party,
 		"amount_field_bank": amount_field_bank,
-		"amount": ref_doc.outstanding_amount,
+		"amount": abs(ref_doc.outstanding_amount),
 		"remarks": 'Payment received against {0} {1}. {2}'.format(dt, dn, ref_doc.remarks),
 		"is_advance": "No"
 	})
-	
+
 def get_payment_entry(ref_doc, args):
 	cost_center = frappe.db.get_value("Company", ref_doc.company, "cost_center")
-	exchange_rate = get_exchange_rate(args.get("party_account"), args.get("party_account_currency"), 
+	exchange_rate = get_exchange_rate(args.get("party_account"), args.get("party_account_currency"),
 		ref_doc.company, ref_doc.doctype, ref_doc.name)

 	jv = frappe.new_doc("Journal Entry")
@@ -592,7 +601,7 @@ def get_payment_entry(ref_doc, args):
 		"company": ref_doc.company,
 		"remark": args.get("remarks")
 	})
-	
+
 	party_row = jv.append("accounts", {
 		"account": args.get("party_account"),
 		"party_type": args.get("party_type"),
@@ -601,7 +610,7 @@ def get_payment_entry(ref_doc, args):
 		"account_type": frappe.db.get_value("Account", args.get("party_account"), "account_type"),
 		"account_currency": args.get("party_account_currency") or \
 			get_account_currency(args.get("party_account")),
-		"account_balance": get_balance_on(args.get("party_account")),
+		"balance": get_balance_on(args.get("party_account")),
 		"party_balance": get_balance_on(party=args.get("party"), party_type=args.get("party_type")),
 		"exchange_rate": exchange_rate,
 		args.get("amount_field_party"): args.get("amount"),
@@ -614,11 +623,11 @@ def get_payment_entry(ref_doc, args):
 	bank_account = get_default_bank_cash_account(ref_doc.company, "Bank Entry")
 	if bank_account:
 		bank_row.update(bank_account)
-		bank_row.exchange_rate = get_exchange_rate(bank_account["account"], 
+		bank_row.exchange_rate = get_exchange_rate(bank_account["account"],
 			bank_account["account_currency"], ref_doc.company)
-			
+
 	bank_row.cost_center = cost_center
-	
+
 	if bank_row.account_currency == args.get("party_account_currency"):
 		bank_row.set(args.get("amount_field_bank"), args.get("amount"))
 	else:
@@ -630,7 +639,8 @@ def get_payment_entry(ref_doc, args):
 			jv.multi_currency = 1

 	jv.set_amounts_in_company_currency()
-	
+	jv.set_total_debit_credit()
+
 	return jv.as_dict()

@frappe.whitelist()
@@ -646,24 +656,27 @@ def get_against_jv(doctype, txt, searchfield, start, page_len, filters):
 	return frappe.db.sql("""select jv.name, jv.posting_date, jv.user_remark
 		from `tabJournal Entry` jv, `tabJournal Entry Account` jv_detail
 		where jv_detail.parent = jv.name and jv_detail.account = %s and ifnull(jv_detail.party, '') = %s
-		and ifnull(jv_detail.reference_type, '') = ''
-		and jv.docstatus = 1 and jv.{0} like %s order by jv.name desc limit %s, %s""".format(searchfield),
+		and (jv_detail.reference_type is null or jv_detail.reference_type = '')
+		and jv.docstatus = 1 and jv.`{0}` like %s order by jv.name desc limit %s, %s""".format(frappe.db.escape(searchfield)),
 		(filters.get("account"), cstr(filters.get("party")), "%{0}%".format(txt), start, page_len))

@frappe.whitelist()
 def get_outstanding(args):
 	if not frappe.has_permission("Account"):
 		frappe.msgprint(_("No Permission"), raise_exception=1)
-	args = eval(args)
+
+	if isinstance(args, basestring):
+		args = json.loads(args)
+
 	company_currency = get_company_currency(args.get("company"))

 	if args.get("doctype") == "Journal Entry":
 		condition = " and party=%(party)s" if args.get("party") else ""

 		against_jv_amount = frappe.db.sql("""
-			select sum(ifnull(debit_in_account_currency, 0)) - sum(ifnull(credit_in_account_currency, 0))
+			select sum(debit_in_account_currency) - sum(credit_in_account_currency)
 			from `tabJournal Entry Account` where parent=%(docname)s and account=%(account)s {0}
-			and ifnull(reference_type, '')=''""".format(condition), args)
+			and (reference_type is null or reference_type = '')""".format(condition), args)

 		against_jv_amount = flt(against_jv_amount[0][0]) if against_jv_amount else 0
 		amount_field = "credit_in_account_currency" if against_jv_amount > 0 else "debit_in_account_currency"
--- a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
+++ b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
@@ -19,12 +19,14 @@
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Account", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "account", 
   "oldfieldtype": "Link", 
   "options": "Account", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "print_width": "250px", 
   "read_only": 0, 
   "report_hide": 0, 
@@ -45,10 +47,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Account Type", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -67,12 +71,14 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Account Balance", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "balance", 
   "oldfieldtype": "Data", 
   "options": "account_currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -93,12 +99,14 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Cost Center", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "cost_center", 
   "oldfieldtype": "Link", 
   "options": "Cost Center", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "print_width": "180px", 
   "read_only": 0, 
   "report_hide": 0, 
@@ -118,9 +126,11 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -139,10 +149,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Party Type", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "DocType", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -161,10 +173,12 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Party", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "party_type", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -183,11 +197,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Party Balance", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "account_currency", 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -208,10 +224,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Currency", 
+   "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, 
@@ -230,11 +248,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Account Currency", 
+   "length": 0, 
   "no_copy": 1, 
   "options": "Currency", 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -252,10 +272,12 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -274,10 +296,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Exchange Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "6", 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -296,9 +320,11 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -316,12 +342,14 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
-   "label": "Debit in Account Currency", 
+   "label": "Debit", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "account_currency", 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 1, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -340,6 +368,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Debit in Company Currency", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "debit", 
   "oldfieldtype": "Currency", 
@@ -347,6 +376,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -364,9 +394,11 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -384,12 +416,14 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
-   "label": "Credit in Account Currency", 
+   "label": "Credit", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "account_currency", 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 1, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -408,6 +442,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Credit in Company Currency", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "credit", 
   "oldfieldtype": "Currency", 
@@ -415,6 +450,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -433,9 +469,11 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Reference", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -454,11 +492,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Reference Type", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "\nSales Invoice\nPurchase Invoice\nJournal Entry\nSales Order\nPurchase Order\nExpense Claim", 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -477,11 +517,13 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Reference Name", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "reference_type", 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -499,9 +541,11 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -520,12 +564,14 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Is Advance", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "is_advance", 
   "oldfieldtype": "Select", 
   "options": "No\nYes", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -544,11 +590,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Against Account", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "against_account", 
   "oldfieldtype": "Text", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -565,7 +613,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 1, 
- "modified": "2015-10-20 12:10:22.203395", 
+ "max_attachments": 0, 
+ "modified": "2015-11-24 02:36:05.804010", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Journal Entry Account", 
--- a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
+++ b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
@@ -20,6 +20,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Mode of Payment", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "mode_of_payment", 
   "oldfieldtype": "Data", 
@@ -43,6 +44,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Accounts", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Mode of Payment Account", 
   "permlevel": 0, 
@@ -65,7 +67,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2015-10-02 07:38:57.318104", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:50.335559", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Mode of Payment", 
--- a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py
+++ b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py
@@ -5,6 +5,24 @@ from __future__ import unicode_literals
 import frappe

 from frappe.model.document import Document
+from frappe import _

 class ModeofPayment(Document):
-	pass
+	def validate(self):
+		self.validate_accounts()
+		self.validate_repeating_companies()
+	
+	def validate_repeating_companies(self):
+		"""Error when Same Company is entered multiple times in accounts"""
+		accounts_list = []
+		for entry in self.accounts:
+			accounts_list.append(entry.company)
+
+		if len(accounts_list)!= len(set(accounts_list)):
+			frappe.throw(_("Same Company is entered more than once"))
+
+	def validate_accounts(self):
+		for entry in self.accounts:
+			"""Error when Company of Ledger account doesn't match with Company Selected"""
+			if frappe.db.get_value("Account", entry.default_account, "company") != entry.company:
+				frappe.throw(_("Account does not match with Company"))
--- a/erpnext/accounts/doctype/mode_of_payment_account/mode_of_payment_account.json
+++ b/erpnext/accounts/doctype/mode_of_payment_account/mode_of_payment_account.json
@@ -19,6 +19,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Company", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company", 
   "permlevel": 0, 
@@ -43,6 +44,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Default Account", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Account", 
   "permlevel": 0, 
@@ -63,7 +65,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 1, 
- "modified": "2015-10-02 07:38:57.388194", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:50.367895", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Mode of Payment Account", 
--- a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json
+++ b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json
@@ -21,6 +21,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Distribution Name", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "distribution_id", 
   "oldfieldtype": "Data", 
@@ -44,6 +45,7 @@
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Fiscal Year", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "fiscal_year", 
   "oldfieldtype": "Select", 
@@ -68,6 +70,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Monthly Distribution Percentages", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "budget_distribution_details", 
   "oldfieldtype": "Table", 
@@ -91,7 +94,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2015-10-02 07:38:57.594541", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:50.431735", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Monthly Distribution", 
--- a/erpnext/accounts/doctype/monthly_distribution_percentage/monthly_distribution_percentage.json
+++ b/erpnext/accounts/doctype/monthly_distribution_percentage/monthly_distribution_percentage.json
@@ -19,6 +19,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Month", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "month", 
   "oldfieldtype": "Data", 
@@ -42,6 +43,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Percentage Allocation", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "percentage_allocation", 
   "oldfieldtype": "Currency", 
@@ -63,7 +65,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 1, 
- "modified": "2015-10-02 07:38:57.670950", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:50.468982", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Monthly Distribution Percentage", 
--- a/erpnext/accounts/doctype/party_account/party_account.json
+++ b/erpnext/accounts/doctype/party_account/party_account.json
@@ -19,6 +19,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Company", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company", 
   "permlevel": 0, 
@@ -41,6 +42,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -63,6 +65,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Account", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Account", 
   "permlevel": 0, 
@@ -82,7 +85,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 1, 
- "modified": "2015-10-02 07:38:59.582533", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:51.450360", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Party Account", 
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
@@ -33,7 +33,7 @@ class PaymentReconciliation(Document):
 				t1.name = t2.parent and t1.docstatus = 1 and t2.docstatus = 1
 				and t2.party_type = %(party_type)s and t2.party = %(party)s
 				and t2.account = %(account)s and {dr_or_cr} > 0
-				and ifnull(t2.reference_type, '') in ('', 'Sales Order', 'Purchase Order')
+				and (t2.reference_type is null or t2.reference_type in ('', 'Sales Order', 'Purchase Order'))
 				{cond}
 				and (CASE
 					WHEN t1.voucher_type in ('Debit Note', 'Credit Note')
--- a/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json
+++ b/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json
@@ -19,6 +19,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Invoice Type", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Sales Invoice\nPurchase Invoice\nJournal Entry", 
   "permlevel": 0, 
@@ -41,6 +42,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Invoice Number", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "", 
   "permlevel": 0, 
@@ -63,6 +65,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Invoice Date", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -84,6 +87,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -105,6 +109,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -126,6 +131,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Outstanding Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -144,7 +150,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 1, 
- "modified": "2015-10-16 06:14:07.460813", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:51.516537", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Payment Reconciliation Invoice", 
--- a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
+++ b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
@@ -19,6 +19,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Journal Entry", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Journal Entry", 
   "permlevel": 0, 
@@ -41,6 +42,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Posting Date", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -62,6 +64,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -83,6 +86,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Is Advance", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -104,6 +108,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Voucher Detail Number", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -125,6 +130,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -146,6 +152,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Invoice Number", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "", 
   "permlevel": 0, 
@@ -168,6 +175,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Allocated amount", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -190,6 +198,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -211,6 +220,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Remark", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -229,7 +239,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 1, 
- "modified": "2015-10-02 07:38:59.835936", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:51.563989", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Payment Reconciliation Payment", 
--- a/erpnext/accounts/doctype/payment_tool/payment_tool.py
+++ b/erpnext/accounts/doctype/payment_tool/payment_tool.py
@@ -8,6 +8,7 @@ from frappe.utils import flt
 from frappe.model.document import Document
 import json
 from erpnext.accounts.utils import get_account_currency
+from erpnext.accounts.doctype.journal_entry.journal_entry import get_exchange_rate

 class PaymentTool(Document):
 	def make_journal_entry(self):
@@ -19,7 +20,15 @@ class PaymentTool(Document):
 		jv.company = self.company
 		jv.cheque_no = self.reference_no
 		jv.cheque_date = self.reference_date
-
+		
+		party_account_currency, party_account_type = frappe.db.get_value("Account", self.party_account, 
+			["account_currency", "account_type"])
+		
+		bank_account_currency, bank_account_type = None, None
+		if self.payment_account:
+			bank_account_currency, bank_account_type = frappe.db.get_value("Account", self.payment_account, 
+				["account_currency", "account_type"])
+		
 		if not self.total_payment_amount:
 			frappe.throw(_("Please enter Payment Amount in atleast one row"))

@@ -27,27 +36,56 @@ class PaymentTool(Document):
 			if not frappe.db.get_value(v.against_voucher_type, {"name": v.against_voucher_no}):
 				frappe.throw(_("Row {0}: {1} is not a valid {2}").format(v.idx, v.against_voucher_no,
 					v.against_voucher_type))
-
+			
 			if v.payment_amount:
+				exchange_rate = get_exchange_rate(self.party_account, party_account_currency,
+					self.company, v.against_voucher_type, v.against_voucher_no)
+				
 				d1 = jv.append("accounts")
 				d1.account = self.party_account
 				d1.party_type = self.party_type
 				d1.party = self.party
+				d1.account_currency = party_account_currency
+				d1.account_type = party_account_type
 				d1.balance = get_balance_on(self.party_account)
+				d1.party_balance = get_balance_on(party=self.party, party_type=self.party_type)
+				d1.exchange_rate = exchange_rate
 				d1.set("debit_in_account_currency" if self.received_or_paid=="Paid" \
 					else "credit_in_account_currency", flt(v.payment_amount))
-				d1.set("reference_type", v.against_voucher_type)
-				d1.set("reference_name", v.against_voucher_no)
-				d1.set('is_advance', 'Yes' if v.against_voucher_type in ['Sales Order', 'Purchase Order'] else 'No')
-				total_payment_amount = flt(total_payment_amount) + \
-					flt(d1.debit_in_account_currency) - flt(d1.credit_in_account_currency)
+				d1.reference_type = v.against_voucher_type
+				d1.reference_name = v.against_voucher_no
+				d1.is_advance = 'Yes' \
+					if v.against_voucher_type in ['Sales Order', 'Purchase Order'] else 'No'
+					
+				amount = flt(d1.debit_in_account_currency) - flt(d1.credit_in_account_currency)
+				if bank_account_currency == party_account_currency:
+					total_payment_amount += amount
+				else:
+					total_payment_amount += amount*exchange_rate

 		d2 = jv.append("accounts")
-		d2.account = self.payment_account
-		d2.set('debit_in_account_currency' if total_payment_amount < 0 \
-			else 'credit_in_account_currency', abs(total_payment_amount))
 		if self.payment_account:
-			d2.balance = get_balance_on(self.payment_account)
+			bank_account_currency, bank_account_type = frappe.db.get_value("Account", self.payment_account, 
+				["account_currency", "account_type"])
+				
+			d2.account = self.payment_account
+			d2.account_currency = bank_account_currency
+			d2.account_type = bank_account_type
+			d2.exchange_rate = get_exchange_rate(self.payment_account, self.company)
+			d2.account_balance = get_balance_on(self.payment_account)
+		
+		amount_field_bank = 'debit_in_account_currency' if total_payment_amount < 0 \
+			else 'credit_in_account_currency'
+		
+		d2.set(amount_field_bank, abs(total_payment_amount))
+		
+		company_currency = frappe.db.get_value("Company", self.company, "default_currency")
+		if party_account_currency != company_currency or \
+			(bank_account_currency and bank_account_currency != company_currency):
+				jv.multi_currency = 1
+			
+		jv.set_amounts_in_company_currency()
+		jv.set_total_debit_credit()

 		return jv.as_dict()

@@ -85,8 +123,8 @@ def get_orders_to_be_billed(party_type, party, party_account_currency, company_c
 	orders = frappe.db.sql("""
 		select
 			name as voucher_no,
-			ifnull({ref_field}, 0) as invoice_amount,
-			(ifnull({ref_field}, 0) - ifnull(advance_paid, 0)) as outstanding_amount,
+			{ref_field} as invoice_amount,
+			({ref_field} - advance_paid) as outstanding_amount,
 			transaction_date as posting_date
 		from
 			`tab{voucher_type}`
@@ -94,8 +132,8 @@ def get_orders_to_be_billed(party_type, party, party_account_currency, company_c
 			{party_type} = %s
 			and docstatus = 1
 			and ifnull(status, "") != "Stopped"
-			and ifnull({ref_field}, 0) > ifnull(advance_paid, 0)
-			and abs(100 - ifnull(per_billed, 0)) > 0.01
+			and {ref_field} > advance_paid
+			and abs(100 - per_billed) > 0.01
 		""".format(**{
 			"ref_field": ref_field,
 			"voucher_type": voucher_type,
@@ -116,7 +154,7 @@ def get_against_voucher_amount(against_voucher_type, against_voucher_no, party_a
 	ref_field = "base_grand_total" if party_account_currency == company_currency else "grand_total"

 	if against_voucher_type in ["Sales Order", "Purchase Order"]:
-		select_cond = "{0} as total_amount, ifnull({0}, 0) - ifnull(advance_paid, 0) as outstanding_amount"\
+		select_cond = "{0} as total_amount, {0} - advance_paid as outstanding_amount"\
 			.format(ref_field)
 	elif against_voucher_type in ["Sales Invoice", "Purchase Invoice"]:
 		select_cond = "{0} as total_amount, outstanding_amount".format(ref_field)
@@ -125,6 +163,6 @@ def get_against_voucher_amount(against_voucher_type, against_voucher_no, party_a
 		select_cond = "{0} as total_amount".format(ref_field)

 	details = frappe.db.sql("""select {0} from `tab{1}` where name = %s"""
-		.format(select_cond, against_voucher_type), against_voucher_no, as_dict=1)
+		.format(select_cond, frappe.db.escape(against_voucher_type)), against_voucher_no, as_dict=1)

 	return details[0] if details else {}
--- a/erpnext/accounts/doctype/payment_tool_detail/payment_tool_detail.json
+++ b/erpnext/accounts/doctype/payment_tool_detail/payment_tool_detail.json
@@ -19,6 +19,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Against Voucher Type", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "DocType", 
   "permlevel": 0, 
@@ -43,6 +44,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Against Voucher No", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "against_voucher_type", 
   "permlevel": 0, 
@@ -64,6 +66,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -86,6 +89,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Total Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "party_account_currency", 
   "permlevel": 0, 
@@ -108,6 +112,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Outstanding Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "party_account_currency", 
   "permlevel": 0, 
@@ -130,6 +135,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Payment Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "party_account_currency", 
   "permlevel": 0, 
@@ -149,7 +155,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 1, 
- "modified": "2015-10-02 07:38:59.950506", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:51.626386", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Payment Tool Detail", 
--- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js
+++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js
@@ -10,12 +10,12 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) {

 // ***************** Get Account Head *****************
 cur_frm.fields_dict['closing_account_head'].get_query = function(doc, cdt, cdn) {
-	return{
-		filters:{
-			"company": doc.company,
-			"root_type": "Liability",
-			"freeze_account": "No",
-			"is_group": 0
-		}
+	return {
+		filters: [
+			['Account', 'company', '=', doc.company],
+			['Account', 'is_group', '=', '0'],
+			['Account', 'freeze_account', '=', 'No'],
+			['Account', 'root_type', 'in', 'Liability, Equity']
+		]
 	}
 }
--- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
+++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
@@ -18,6 +18,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
@@ -41,6 +42,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Transaction Date", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "transaction_date", 
   "oldfieldtype": "Date", 
@@ -64,6 +66,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Posting Date", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "posting_date", 
   "oldfieldtype": "Date", 
@@ -87,6 +90,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Closing Fiscal Year", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "fiscal_year", 
   "oldfieldtype": "Select", 
@@ -111,6 +115,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Amended From", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "amended_from", 
   "oldfieldtype": "Data", 
@@ -135,6 +140,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Company", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "company", 
   "oldfieldtype": "Select", 
@@ -158,6 +164,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
@@ -181,6 +188,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Closing Account Head", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "closing_account_head", 
   "oldfieldtype": "Link", 
@@ -205,6 +213,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Remarks", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "remarks", 
   "oldfieldtype": "Small Text", 
@@ -227,7 +236,8 @@
 "is_submittable": 1, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2015-10-21 12:40:58.278256", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:51.671436", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Period Closing Voucher", 
--- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
+++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
@@ -22,21 +22,21 @@ class PeriodClosingVoucher(AccountsController):

 	def validate_account_head(self):
 		closing_account_type = frappe.db.get_value("Account", self.closing_account_head, "root_type")
-		
-		if closing_account_type != "Liability":
-			frappe.throw(_("Closing Account {0} must be of type 'Liability'")
+
+		if closing_account_type not in ["Liability", "Equity"]:
+			frappe.throw(_("Closing Account {0} must be of type Liability / Equity")
 				.format(self.closing_account_head))

 		account_currency = get_account_currency(self.closing_account_head)
-		company_currency = frappe.db.get_value("Company", self.company, "default_currency")		
+		company_currency = frappe.db.get_value("Company", self.company, "default_currency")
 		if account_currency != company_currency:
 			frappe.throw(_("Currency of the Closing Account must be {0}").format(company_currency))

 	def validate_posting_date(self):
 		from erpnext.accounts.utils import get_fiscal_year, validate_fiscal_year
-		
+
 		validate_fiscal_year(self.posting_date, self.fiscal_year, label=_("Posting Date"), doc=self)
-		
+
 		self.year_start_date = get_fiscal_year(self.posting_date, self.fiscal_year)[1]

 		pce = frappe.db.sql("""select name from `tabPeriod Closing Voucher`
@@ -50,7 +50,7 @@ class PeriodClosingVoucher(AccountsController):
 		gl_entries = []
 		net_pl_balance = 0
 		pl_accounts = self.get_pl_balances()
-		
+
 		for acc in pl_accounts:
 			if flt(acc.balance_in_company_currency):
 				gl_entries.append(self.get_gl_dict({
@@ -67,7 +67,7 @@ class PeriodClosingVoucher(AccountsController):
 				}))

 				net_pl_balance += flt(acc.balance_in_company_currency)
-		
+
 		if net_pl_balance:
 			gl_entries.append(self.get_gl_dict({
 				"account": self.closing_account_head,
@@ -76,20 +76,20 @@ class PeriodClosingVoucher(AccountsController):
 				"credit_in_account_currency": abs(net_pl_balance) if net_pl_balance < 0 else 0,
 				"credit": abs(net_pl_balance) if net_pl_balance < 0 else 0
 			}))
-		
+
 		from erpnext.accounts.general_ledger import make_gl_entries
 		make_gl_entries(gl_entries)

 	def get_pl_balances(self):
 		"""Get balance for pl accounts"""
 		return frappe.db.sql("""
-			select 
-				t1.account, t2.account_currency,  				sum(ifnull(t1.debit_in_account_currency,0))-sum(ifnull(t1.credit_in_account_currency,0)) 
-					as balance_in_account_currency,
-				sum(ifnull(t1.debit,0))-sum(ifnull(t1.credit,0)) as balance_in_company_currency
+			select
+				t1.account, t2.account_currency,
+				sum(t1.debit_in_account_currency) - sum(t1.credit_in_account_currency) as balance_in_account_currency,
+				sum(t1.debit) - sum(t1.credit) as balance_in_company_currency
 			from `tabGL Entry` t1, `tabAccount` t2
-			where t1.account = t2.name and ifnull(t2.report_type, '') = 'Profit and Loss'
+			where t1.account = t2.name and t2.report_type = 'Profit and Loss'
 			and t2.docstatus < 2 and t2.company = %s
 			and t1.posting_date between %s and %s
 			group by t1.account
-		""", (self.company, self.get("year_start_date"), self.posting_date), as_dict=1)
+		""", (self.company, self.get("year_start_date"), self.posting_date), as_dict=1)
--- a/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
+++ b/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
@@ -12,60 +12,60 @@ from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journ
 class TestPeriodClosingVoucher(unittest.TestCase):
 	def test_closing_entry(self):
 		year_start_date = get_fiscal_year(today())[1]
-		
-		make_journal_entry("_Test Bank - _TC", "Sales - _TC", 400, 
+
+		make_journal_entry("_Test Bank - _TC", "Sales - _TC", 400,
 			"_Test Cost Center - _TC", submit=True)
-		
-		make_journal_entry("_Test Account Cost for Goods Sold - _TC", 
+
+		make_journal_entry("_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC", 600, "_Test Cost Center - _TC", submit=True)
-			
+
 		random_expense_account = frappe.db.sql("""
-			select t1.account, 
-				sum(ifnull(t1.debit,0))-sum(ifnull(t1.credit,0)) as balance,
-				sum(ifnull(t1.debit_in_account_currency,0))-sum(ifnull(t1.credit_in_account_currency,0)) \
+			select t1.account,
+				sum(t1.debit) - sum(t1.credit) as balance,
+				sum(t1.debit_in_account_currency) - sum(t1.credit_in_account_currency) \
 					as balance_in_account_currency
 			from `tabGL Entry` t1, `tabAccount` t2
-			where t1.account = t2.name and ifnull(t2.root_type, '') = 'Expense'
+			where t1.account = t2.name and t2.root_type = 'Expense'
 				and t2.docstatus < 2 and t2.company = '_Test Company'
 				and t1.posting_date between %s and %s
 			group by t1.account
-			having sum(ifnull(t1.debit,0)) > sum(ifnull(t1.credit,0))
+			having sum(t1.debit) > sum(t1.credit)
 			limit 1""", (year_start_date, today()), as_dict=True)
-			
-		profit_or_loss = frappe.db.sql("""select sum(ifnull(t1.debit,0))-sum(ifnull(t1.credit,0)) as balance
+
+		profit_or_loss = frappe.db.sql("""select sum(t1.debit) - sum(t1.credit) as balance
 			from `tabGL Entry` t1, `tabAccount` t2
-			where t1.account = t2.name and ifnull(t2.report_type, '') = 'Profit and Loss'
+			where t1.account = t2.name and t2.report_type = 'Profit and Loss'
 			and t2.docstatus < 2 and t2.company = '_Test Company'
 			and t1.posting_date between %s and %s""", (year_start_date, today()))
-			
+
 		profit_or_loss = flt(profit_or_loss[0][0]) if profit_or_loss else 0
-		
+
 		pcv = self.make_period_closing_voucher()
-		
+
 		# Check value for closing account
-		gle_amount_for_closing_account = frappe.db.sql("""select ifnull(debit, 0) - ifnull(credit, 0)
+		gle_amount_for_closing_account = frappe.db.sql("""select debit - credit
 			from `tabGL Entry` where voucher_type='Period Closing Voucher' and voucher_no=%s
 			and account = '_Test Account Reserves and Surplus - _TC'""", pcv.name)
-			
+
 		gle_amount_for_closing_account = flt(gle_amount_for_closing_account[0][0]) \
 			if gle_amount_for_closing_account else 0

 		self.assertEqual(gle_amount_for_closing_account, profit_or_loss)
-		
+
 		if random_expense_account:
 			# Check posted value for teh above random_expense_account
 			gle_for_random_expense_account = frappe.db.sql("""
-				select ifnull(debit, 0) - ifnull(credit, 0) as amount,
-					ifnull(debit_in_account_currency, 0) - ifnull(credit_in_account_currency, 0) 
+				select debit - credit as amount,
+					debit_in_account_currency - credit_in_account_currency
 						as amount_in_account_currency
-				from `tabGL Entry` 
-				where voucher_type='Period Closing Voucher' and voucher_no=%s and account =%s""", 
+				from `tabGL Entry`
+				where voucher_type='Period Closing Voucher' and voucher_no=%s and account =%s""",
 				(pcv.name, random_expense_account[0].account), as_dict=True)
-			
+
 			self.assertEqual(gle_for_random_expense_account[0].amount, -1*random_expense_account[0].balance)
-			self.assertEqual(gle_for_random_expense_account[0].amount_in_account_currency, 
+			self.assertEqual(gle_for_random_expense_account[0].amount_in_account_currency,
 				-1*random_expense_account[0].balance_in_account_currency)
-		
+
 	def make_period_closing_voucher(self):
 		pcv = frappe.get_doc({
 			"doctype": "Period Closing Voucher",
@@ -77,7 +77,7 @@ class TestPeriodClosingVoucher(unittest.TestCase):
 		})
 		pcv.insert()
 		pcv.submit()
-		
+
 		return pcv


--- a/erpnext/accounts/doctype/pos_profile/pos_profile.json
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.json
@@ -19,6 +19,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Applicable for User", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "user", 
   "oldfieldtype": "Link", 
@@ -43,6 +44,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Series", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "naming_series", 
   "oldfieldtype": "Select", 
@@ -67,6 +69,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Warehouse", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "warehouse", 
   "oldfieldtype": "Link", 
@@ -93,6 +96,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Update Stock", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -113,6 +117,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -135,6 +140,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Customer", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "customer_account", 
   "oldfieldtype": "Link", 
@@ -159,6 +165,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Company", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "company", 
   "oldfieldtype": "Link", 
@@ -183,6 +190,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Currency", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "currency", 
   "oldfieldtype": "Select", 
@@ -207,6 +215,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Mode of Payment", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Mode of Payment", 
   "permlevel": 0, 
@@ -229,6 +238,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -251,6 +261,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Print Format", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Print Format", 
   "permlevel": 0, 
@@ -274,6 +285,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Letter Head", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "letter_head", 
   "oldfieldtype": "Select", 
@@ -298,6 +310,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Print Heading", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "select_print_heading", 
   "oldfieldtype": "Select", 
@@ -322,6 +335,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Terms and Conditions", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "tc_name", 
   "oldfieldtype": "Link", 
@@ -345,6 +359,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
@@ -368,6 +383,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Territory", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "territory", 
   "oldfieldtype": "Link", 
@@ -392,6 +408,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Price List", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "price_list_name", 
   "oldfieldtype": "Select", 
@@ -415,6 +432,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -437,6 +455,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Write Off Account", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Account", 
   "permlevel": 0, 
@@ -460,6 +479,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Write Off Cost Center", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Cost Center", 
   "permlevel": 0, 
@@ -483,6 +503,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Taxes and Charges", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "charge", 
   "oldfieldtype": "Link", 
@@ -506,6 +527,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -528,6 +550,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Cash/Bank Account", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "cash_bank_account", 
   "oldfieldtype": "Link", 
@@ -552,6 +575,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Income Account", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "income_account", 
   "oldfieldtype": "Link", 
@@ -577,6 +601,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Expense Account", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Account", 
   "permlevel": 0, 
@@ -599,6 +624,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Cost Center", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "cost_center", 
   "oldfieldtype": "Link", 
@@ -622,7 +648,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2015-10-02 07:39:00.196535", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:51.741253", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "POS Profile", 
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
@@ -20,6 +20,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -41,6 +42,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Title", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "precision": "", 
@@ -63,7 +65,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
-   "label": "Apply On",  
+   "label": "Apply On", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "\nItem Code\nItem Group\nBrand", 
   "permlevel": 0, 
@@ -87,6 +90,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Item Code", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Item", 
   "permlevel": 0, 
@@ -110,6 +114,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Brand", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Brand", 
   "permlevel": 0, 
@@ -133,6 +138,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Item Group", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Item Group", 
   "permlevel": 0, 
@@ -154,6 +160,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -176,7 +183,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Priority",  
+   "label": "Priority", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20", 
   "permlevel": 0, 
@@ -199,6 +207,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Disable", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -219,6 +228,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -241,6 +251,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Selling", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -262,6 +273,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Buying", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -282,6 +294,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -304,7 +317,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Applicable For",  
+   "label": "Applicable For", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "\nCustomer\nCustomer Group\nTerritory\nSales Partner\nCampaign\nSupplier\nSupplier Type", 
   "permlevel": 0, 
@@ -328,6 +342,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Customer", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Customer", 
   "permlevel": 0, 
@@ -351,6 +366,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Customer Group", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Customer Group", 
   "permlevel": 0, 
@@ -374,6 +390,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Territory", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Territory", 
   "permlevel": 0, 
@@ -397,6 +414,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Sales Partner", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Sales Partner", 
   "permlevel": 0, 
@@ -420,6 +438,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Campaign", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Campaign", 
   "permlevel": 0, 
@@ -443,6 +462,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Supplier", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Supplier", 
   "permlevel": 0, 
@@ -466,6 +486,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Supplier Type", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Supplier Type", 
   "permlevel": 0, 
@@ -487,6 +508,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -509,6 +531,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Min Qty", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -529,6 +552,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -551,6 +575,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Max Qty", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -571,6 +596,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -594,6 +620,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Valid From", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -615,6 +642,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Valid Upto", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -635,6 +663,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -656,6 +685,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Company", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company", 
   "permlevel": 0, 
@@ -678,6 +708,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -699,7 +730,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Price or Discount",  
+   "label": "Price or Discount", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "\nPrice\nDiscount Percentage", 
   "permlevel": 0, 
@@ -721,6 +753,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -743,6 +776,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Price", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -765,6 +799,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Discount on Price List Rate (%)", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -787,6 +822,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "For Price List", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Price List", 
   "permlevel": 0, 
@@ -809,6 +845,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Simple", 
   "permlevel": 0, 
@@ -831,6 +868,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Pricing Rule Help", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -851,7 +889,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2015-10-02 07:39:00.632196", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:51.958974", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Pricing Rule", 
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -179,7 +179,7 @@ def get_pricing_rules(args):
 			if parent_groups:
 				if allow_blank: parent_groups.append('')
 				condition = " ifnull("+field+", '') in ('" + \
-					"', '".join([d.replace("'", "\\'").replace('"', '\\"').replace("%", "%%") for d in parent_groups])+"')"
+					"', '".join([frappe.db.escape(d) for d in parent_groups])+"')"
 		return condition


@@ -206,8 +206,8 @@ def get_pricing_rules(args):

 	return frappe.db.sql("""select * from `tabPricing Rule`
 		where (item_code=%(item_code)s {item_group_condition} or brand=%(brand)s)
-			and docstatus < 2 and ifnull(disable, 0) = 0
-			and ifnull({transaction_type}, 0) = 1 {conditions}
+			and docstatus < 2 and disable = 0
+			and {transaction_type} = 1 {conditions}
 		order by priority desc, name desc""".format(
 			item_group_condition=item_group_condition,
 			transaction_type=args.transaction_type, conditions=conditions), args, as_dict=1)
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -20,6 +20,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Title", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "precision": "", 
@@ -41,7 +42,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Series",  
+   "label": "Series", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "naming_series", 
   "oldfieldtype": "Select", 
@@ -66,6 +68,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Supplier", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "supplier", 
   "oldfieldtype": "Link", 
@@ -91,6 +94,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Supplier Name", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "supplier_name", 
   "oldfieldtype": "Data", 
@@ -114,6 +118,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Address", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -135,6 +140,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Contact", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -156,6 +162,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Mobile No", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -177,6 +184,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Contact Email", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -197,6 +205,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
@@ -221,6 +230,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Date", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "posting_date", 
   "oldfieldtype": "Date", 
@@ -245,6 +255,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Supplier Invoice No", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "bill_no", 
   "oldfieldtype": "Data", 
@@ -268,6 +279,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Supplier Invoice Date", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "bill_date", 
   "oldfieldtype": "Date", 
@@ -291,6 +303,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Amended From", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "amended_from", 
   "oldfieldtype": "Link", 
@@ -315,6 +328,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Company", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "company", 
   "oldfieldtype": "Link", 
@@ -339,6 +353,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Is Return", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -362,6 +377,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Return Against Purchase Invoice", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Purchase Invoice", 
   "permlevel": 0, 
@@ -385,6 +401,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Currency and Price List", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "icon-tag", 
   "permlevel": 0, 
@@ -407,6 +424,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Currency", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "currency", 
   "oldfieldtype": "Select", 
@@ -432,6 +450,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Exchange Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "conversion_rate", 
   "oldfieldtype": "Currency", 
@@ -455,6 +474,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -476,6 +496,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Price List", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Price List", 
   "permlevel": 0, 
@@ -498,6 +519,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Price List Currency", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Currency", 
   "permlevel": 0, 
@@ -520,6 +542,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Price List Exchange Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "9", 
@@ -542,6 +565,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Ignore Pricing Rule", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 1, 
   "print_hide": 1, 
@@ -563,6 +587,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-shopping-cart", 
@@ -586,6 +611,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Items", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "entries", 
   "oldfieldtype": "Table", 
@@ -599,6 +625,29 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "get_items_from_product_bundle", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Get Items from Product Bundle", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
  {
   "allow_on_submit": 0, 
   "bold": 0, 
@@ -609,6 +658,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -630,6 +680,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -654,6 +705,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Net Total (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "net_total", 
   "oldfieldtype": "Currency", 
@@ -677,6 +729,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -698,6 +751,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "currency", 
   "permlevel": 0, 
@@ -721,6 +775,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Net Total", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "net_total_import", 
   "oldfieldtype": "Currency", 
@@ -745,6 +800,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-money", 
@@ -768,6 +824,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Taxes and Charges", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "purchase_other_charges", 
   "oldfieldtype": "Link", 
@@ -792,6 +849,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Purchase Taxes and Charges", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "purchase_tax_details", 
   "oldfieldtype": "Table", 
@@ -816,6 +874,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Taxes and Charges Calculation", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "HTML", 
   "permlevel": 0, 
@@ -838,6 +897,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-money", 
@@ -861,6 +921,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Taxes and Charges Added (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "other_charges_added", 
   "oldfieldtype": "Currency", 
@@ -885,6 +946,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Taxes and Charges Deducted (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "other_charges_deducted", 
   "oldfieldtype": "Currency", 
@@ -909,6 +971,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total Taxes and Charges (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "total_tax", 
   "oldfieldtype": "Currency", 
@@ -932,6 +995,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -954,6 +1018,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Taxes and Charges Added", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "other_charges_added_import", 
   "oldfieldtype": "Currency", 
@@ -978,6 +1043,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Taxes and Charges Deducted", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "other_charges_deducted_import", 
   "oldfieldtype": "Currency", 
@@ -1002,6 +1068,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total Taxes and Charges", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "currency", 
   "permlevel": 0, 
@@ -1026,6 +1093,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Additional Discount", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -1048,7 +1116,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Apply Additional Discount On",  
+   "label": "Apply Additional Discount On", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "\nGrand Total\nNet Total", 
   "permlevel": 0, 
@@ -1071,6 +1140,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -1093,6 +1163,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Additional Discount Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "currency", 
   "permlevel": 0, 
@@ -1116,6 +1187,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Additional Discount Amount (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -1138,6 +1210,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -1160,6 +1233,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Grand Total (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "grand_total", 
   "oldfieldtype": "Currency", 
@@ -1185,6 +1259,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "In Words (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "in_words", 
   "oldfieldtype": "Data", 
@@ -1207,6 +1282,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
@@ -1230,6 +1306,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Grand Total", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "grand_total_import", 
   "oldfieldtype": "Currency", 
@@ -1254,6 +1331,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "In Words", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "in_words_import", 
   "oldfieldtype": "Data", 
@@ -1277,6 +1355,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total Advance", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "total_advance", 
   "oldfieldtype": "Currency", 
@@ -1301,6 +1380,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Outstanding Amount", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "outstanding_amount", 
   "oldfieldtype": "Currency", 
@@ -1327,6 +1407,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Write Off", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -1349,6 +1430,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Write Off Amount", 
+   "length": 0, 
   "no_copy": 1, 
   "options": "currency", 
   "permlevel": 0, 
@@ -1371,6 +1453,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Write Off Amount (Company Currency)", 
+   "length": 0, 
   "no_copy": 1, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -1393,6 +1476,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -1416,6 +1500,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Write Off Account", 
+   "length": 0, 
   "no_copy": 1, 
   "options": "Account", 
   "permlevel": 0, 
@@ -1439,6 +1524,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Write Off Cost Center", 
+   "length": 0, 
   "no_copy": 1, 
   "options": "Cost Center", 
   "permlevel": 0, 
@@ -1462,6 +1548,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Advance Payments", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-money", 
@@ -1485,6 +1572,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Get Advances Paid", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Button", 
   "options": "get_advances", 
@@ -1508,6 +1596,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Advances", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "advance_allocation_details", 
   "oldfieldtype": "Table", 
@@ -1533,6 +1622,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Terms and Conditions", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "icon-legal", 
   "permlevel": 0, 
@@ -1555,6 +1645,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Terms", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Terms and Conditions", 
   "permlevel": 0, 
@@ -1577,6 +1668,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Terms and Conditions1", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -1599,6 +1691,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Contact Details", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "icon-bullhorn", 
   "permlevel": 0, 
@@ -1621,6 +1714,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Supplier Address", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Address", 
   "permlevel": 0, 
@@ -1642,6 +1736,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -1664,6 +1759,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Contact Person", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Contact", 
   "permlevel": 0, 
@@ -1686,6 +1782,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Printing Settings", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -1708,6 +1805,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Letter Head", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Letter Head", 
   "permlevel": 0, 
@@ -1731,6 +1829,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Print Heading", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "select_print_heading", 
   "oldfieldtype": "Link", 
@@ -1755,6 +1854,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "More Information", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-file-text", 
@@ -1779,6 +1879,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Credit To", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "credit_to", 
   "oldfieldtype": "Link", 
@@ -1803,6 +1904,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Party Account Currency", 
+   "length": 0, 
   "no_copy": 1, 
   "options": "Currency", 
   "permlevel": 0, 
@@ -1827,7 +1929,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 1, 
   "in_list_view": 0, 
-   "label": "Is Opening",  
+   "label": "Is Opening", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "is_opening", 
   "oldfieldtype": "Select", 
@@ -1852,6 +1955,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Due Date", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "due_date", 
   "oldfieldtype": "Date", 
@@ -1875,6 +1979,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Against Expense Account", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "against_expense_account", 
   "oldfieldtype": "Small Text", 
@@ -1897,6 +2002,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -1918,6 +2024,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Mode of Payment", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "mode_of_payment", 
   "oldfieldtype": "Select", 
@@ -1942,6 +2049,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Fiscal Year", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "fiscal_year", 
   "oldfieldtype": "Select", 
@@ -1966,6 +2074,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Remarks", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "remarks", 
   "oldfieldtype": "Text", 
@@ -1991,6 +2100,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Recurring Invoice", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "icon-time", 
   "permlevel": 0, 
@@ -2015,6 +2125,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Is Recurring", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -2037,7 +2148,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Recurring Type",  
+   "label": "Recurring Type", 
+   "length": 0, 
   "no_copy": 1, 
   "options": "Monthly\nQuarterly\nHalf-yearly\nYearly", 
   "permlevel": 0, 
@@ -2062,6 +2174,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "From Date", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -2085,6 +2198,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "To Date", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -2108,6 +2222,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Repeat on Day of Month", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -2131,6 +2246,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "End Date", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -2151,6 +2267,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -2175,6 +2292,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Next Date", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -2198,6 +2316,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Recurring Id", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -2221,6 +2340,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Notification Email Address", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -2243,6 +2363,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Recurring Print Format", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Print Format", 
   "permlevel": 0, 
@@ -2265,7 +2386,8 @@
 "is_submittable": 1, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2015-10-12 16:23:32.141069", 
+ "max_attachments": 0, 
+ "modified": "2015-11-23 10:09:18.620977", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Purchase Invoice", 
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -106,7 +106,7 @@ class PurchaseInvoice(BuyingController):
 	def check_for_stopped_or_closed_status(self):
 		check_list = []
 		pc_obj = frappe.get_doc('Purchase Common')
-		
+
 		for d in self.get('items'):
 			if d.purchase_order and not d.purchase_order in check_list and not d.purchase_receipt:
 				check_list.append(d.purchase_order)
@@ -176,9 +176,10 @@ class PurchaseInvoice(BuyingController):
 					 throw(_("Purchse Order number required for Item {0}").format(d.item_code))

 	def pr_required(self):
+		stock_items = self.get_stock_items()
 		if frappe.db.get_value("Buying Settings", None, "pr_required") == 'Yes':
 			 for d in self.get('items'):
-				 if not d.purchase_receipt:
+				 if not d.purchase_receipt and d.item_code in stock_items:
 					 throw(_("Purchase Receipt number required for Item {0}").format(d.item_code))

 	def validate_write_off_account(self):
@@ -395,7 +396,7 @@ class PurchaseInvoice(BuyingController):

 	def on_cancel(self):
 		self.check_for_stopped_or_closed_status()
-		
+
 		if not self.is_return:
 			from erpnext.accounts.utils import remove_against_link_from_jv
 			remove_against_link_from_jv(self.doctype, self.name)
@@ -438,10 +439,10 @@ def get_expense_account(doctype, txt, searchfield, start, page_len, filters):
 					or tabAccount.account_type in ("Expense Account", "Fixed Asset", "Temporary"))
 				and tabAccount.is_group=0
 				and tabAccount.docstatus!=2
-				and tabAccount.company = '%(company)s'
-				and tabAccount.%(key)s LIKE '%(txt)s'
-				%(mcond)s""" % {'company': filters['company'], 'key': searchfield,
-			'txt': "%%%s%%" % frappe.db.escape(txt), 'mcond':get_match_cond(doctype)})
+				and tabAccount.company = %(company)s
+				and tabAccount.{key} LIKE %(txt)s
+				{mcond}""".format( key=frappe.db.escape(searchfield), mcond=get_match_cond(doctype) ),
+				{ 'company': filters['company'], 'txt': "%%%s%%" % frappe.db.escape(txt) })

@frappe.whitelist()
 def make_debit_note(source_name, target_doc=None):
--- a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
@@ -221,7 +221,7 @@ class TestPurchaseInvoice(unittest.TestCase):
 		test_recurring_document(self, test_records)

 	def test_total_purchase_cost_for_project(self):
-		existing_purchase_cost = frappe.db.sql("""select sum(ifnull(base_net_amount, 0))
+		existing_purchase_cost = frappe.db.sql("""select sum(base_net_amount)
 			from `tabPurchase Invoice Item` where project_name = '_Test Project' and docstatus=1""")
 		existing_purchase_cost = existing_purchase_cost and existing_purchase_cost[0][0] or 0

--- a/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
+++ b/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
@@ -18,6 +18,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Journal Entry", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "journal_voucher", 
   "oldfieldtype": "Link", 
@@ -44,6 +45,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Journal Entry Detail No", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "jv_detail_no", 
   "oldfieldtype": "Date", 
@@ -69,6 +71,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Remarks", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "remarks", 
   "oldfieldtype": "Small Text", 
@@ -93,6 +96,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -114,6 +118,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Advance Amount", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "advance_amount", 
   "oldfieldtype": "Currency", 
@@ -140,6 +145,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Allocated Amount", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "allocated_amount", 
   "oldfieldtype": "Currency", 
@@ -164,7 +170,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 1, 
- "modified": "2015-10-02 07:39:03.538046", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:53.288895", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Purchase Invoice Advance", 
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
@@ -19,6 +19,7 @@
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Item", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "item_code", 
   "oldfieldtype": "Link", 
@@ -42,6 +43,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -63,6 +65,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Item Name", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "item_name", 
   "oldfieldtype": "Data", 
@@ -86,6 +89,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Description", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -108,6 +112,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Description", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "description", 
   "oldfieldtype": "Text", 
@@ -133,6 +138,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Image", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -155,6 +161,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Image View", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "image", 
   "permlevel": 0, 
@@ -178,6 +185,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Quantity and Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -199,6 +207,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Qty", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "qty", 
   "oldfieldtype": "Currency", 
@@ -221,6 +230,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -242,6 +252,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "UOM", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "UOM", 
   "permlevel": 0, 
@@ -264,6 +275,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Conversion Factor", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -284,6 +296,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -305,6 +318,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Price List Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "currency", 
   "permlevel": 0, 
@@ -328,6 +342,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Discount on Price List Rate (%)", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -348,6 +363,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -369,6 +385,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Price List Rate (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -390,6 +407,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -411,6 +429,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Rate ", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "import_rate", 
   "oldfieldtype": "Currency", 
@@ -435,6 +454,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "import_amount", 
   "oldfieldtype": "Currency", 
@@ -458,6 +478,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -479,6 +500,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Rate (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "rate", 
   "oldfieldtype": "Currency", 
@@ -503,6 +525,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Amount (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "amount", 
   "oldfieldtype": "Currency", 
@@ -527,6 +550,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Pricing Rule", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Pricing Rule", 
   "permlevel": 0, 
@@ -548,6 +572,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -570,6 +595,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Net Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "currency", 
   "permlevel": 0, 
@@ -593,6 +619,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Net Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "currency", 
   "permlevel": 0, 
@@ -615,6 +642,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -637,6 +665,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Net Rate (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -660,6 +689,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Net Amount (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -683,6 +713,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Accounting", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -704,6 +735,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Expense Head", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "expense_head", 
   "oldfieldtype": "Link", 
@@ -729,6 +761,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -750,6 +783,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Project Name", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Project", 
   "permlevel": 0, 
@@ -773,6 +807,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Cost Center", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "cost_center", 
   "oldfieldtype": "Link", 
@@ -799,6 +834,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Reference", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -820,6 +856,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Brand", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "brand", 
   "oldfieldtype": "Data", 
@@ -844,6 +881,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Item Group", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "item_group", 
   "oldfieldtype": "Link", 
@@ -869,6 +907,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Item Tax Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "item_tax_rate", 
   "oldfieldtype": "Small Text", 
@@ -892,6 +931,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Item Tax Amount", 
+   "length": 0, 
   "no_copy": 1, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -916,6 +956,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Purchase Order", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "purchase_order", 
   "oldfieldtype": "Link", 
@@ -939,6 +980,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -960,6 +1002,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Purchase Order Item", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "po_detail", 
   "oldfieldtype": "Data", 
@@ -983,6 +1026,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Purchase Receipt", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "purchase_receipt", 
   "oldfieldtype": "Link", 
@@ -1007,6 +1051,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Page Break", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -1028,6 +1073,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "PR Detail", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "pr_detail", 
   "oldfieldtype": "Data", 
@@ -1051,6 +1097,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Valuation Rate", 
+   "length": 0, 
   "no_copy": 1, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -1073,6 +1120,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Raw Materials Supplied Cost", 
+   "length": 0, 
   "no_copy": 1, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -1093,7 +1141,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 1, 
- "modified": "2015-10-19 03:04:52.304768", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:53.343792", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Purchase Invoice Item", 
--- a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
+++ b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
@@ -19,7 +19,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Consider Tax or Charge for",  
+   "label": "Consider Tax or Charge for", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "category", 
   "oldfieldtype": "Select", 
@@ -44,7 +45,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Add or Deduct",  
+   "label": "Add or Deduct", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "add_deduct_tax", 
   "oldfieldtype": "Select", 
@@ -68,7 +70,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
-   "label": "Type",  
+   "label": "Type", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "charge_type", 
   "oldfieldtype": "Select", 
@@ -94,6 +97,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Reference Row #", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "row_id", 
   "oldfieldtype": "Data", 
@@ -118,6 +122,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Is this Tax included in Basic Rate?", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -139,6 +144,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -160,6 +166,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Account Head", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "account_head", 
   "oldfieldtype": "Link", 
@@ -185,6 +192,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Cost Center", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "cost_center", 
   "oldfieldtype": "Link", 
@@ -209,6 +217,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Description", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "description", 
   "oldfieldtype": "Small Text", 
@@ -233,6 +242,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -255,6 +265,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "rate", 
   "oldfieldtype": "Currency", 
@@ -277,6 +288,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -299,6 +311,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "tax_amount", 
   "oldfieldtype": "Currency", 
@@ -323,6 +336,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Tax Amount After Discount Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "currency", 
   "permlevel": 0, 
@@ -346,6 +360,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "total", 
   "oldfieldtype": "Currency", 
@@ -369,6 +384,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -391,6 +407,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Amount (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -414,6 +431,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -437,6 +455,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Tax Amount After Discount Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -460,6 +479,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Item Wise Tax Detail ", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "item_wise_tax_detail", 
   "oldfieldtype": "Small Text", 
@@ -483,6 +503,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Parenttype", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "parenttype", 
   "oldfieldtype": "Data", 
@@ -504,7 +525,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 1, 
- "modified": "2015-10-02 07:39:06.372275", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:54.644704", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Purchase Taxes and Charges", 
--- a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json
+++ b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json
@@ -21,6 +21,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Title", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "title", 
   "oldfieldtype": "Data", 
@@ -44,6 +45,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Default", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -65,6 +67,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Disabled", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -87,6 +90,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -109,6 +113,7 @@
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Company", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company", 
   "permlevel": 0, 
@@ -131,6 +136,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -153,6 +159,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Purchase Taxes and Charges", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "purchase_tax_details", 
   "oldfieldtype": "Table", 
@@ -176,7 +183,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2015-10-02 07:39:06.563868", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:54.729312", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Purchase Taxes and Charges Template", 
--- a/erpnext/accounts/doctype/sales_invoice/pos.py
+++ b/erpnext/accounts/doctype/sales_invoice/pos.py
@@ -48,7 +48,7 @@ def get_items(price_list, sales_or_purchase, item=None):
 		ON
 			(item_det.item_code=i.name or item_det.item_code=i.variant_of)
 		where
-			ifnull(i.has_variants, 0) = 0 and
+			i.has_variants = 0 and
 			{condition}
 		order by
 			{order_by}
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -21,6 +21,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "icon-user", 
   "permlevel": 0, 
@@ -44,6 +45,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Title", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "precision": "", 
@@ -66,6 +68,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Series", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "naming_series", 
   "oldfieldtype": "Select", 
@@ -90,6 +93,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Customer", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "customer", 
   "oldfieldtype": "Link", 
@@ -115,6 +119,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Customer Name", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "customer_name", 
   "oldfieldtype": "Data", 
@@ -138,6 +143,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Address", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -159,6 +165,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Contact", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -180,6 +187,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Mobile No", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -201,6 +209,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Contact Email", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -222,6 +231,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Is POS", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "is_pos", 
   "oldfieldtype": "Check", 
@@ -246,6 +256,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Is Return", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -267,6 +278,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
@@ -290,6 +302,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Date", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "posting_date", 
   "oldfieldtype": "Date", 
@@ -313,6 +326,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Payment Due Date", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "due_date", 
   "oldfieldtype": "Date", 
@@ -336,6 +350,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Company", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "company", 
   "oldfieldtype": "Link", 
@@ -360,6 +375,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Amended From", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "amended_from", 
   "oldfieldtype": "Link", 
@@ -385,6 +401,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Return Against Sales Invoice", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Sales Invoice", 
   "permlevel": 0, 
@@ -408,6 +425,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Shipping Address Name", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Address", 
   "permlevel": 0, 
@@ -431,6 +449,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Shipping Address", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -453,6 +472,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Currency and Price List", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "", 
   "permlevel": 0, 
@@ -475,6 +495,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Currency", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "currency", 
   "oldfieldtype": "Select", 
@@ -500,6 +521,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Exchange Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "conversion_rate", 
   "oldfieldtype": "Currency", 
@@ -523,6 +545,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -545,6 +568,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Price List", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "price_list_name", 
   "oldfieldtype": "Select", 
@@ -569,6 +593,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Price List Currency", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Currency", 
   "permlevel": 0, 
@@ -592,6 +617,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Price List Exchange Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "9", 
@@ -614,6 +640,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Ignore Pricing Rule", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 1, 
   "print_hide": 1, 
@@ -635,6 +662,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-shopping-cart", 
@@ -658,6 +686,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Update Stock", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "update_stock", 
   "oldfieldtype": "Check", 
@@ -681,6 +710,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Items", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "entries", 
   "oldfieldtype": "Table", 
@@ -705,6 +735,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Packing List", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "icon-suitcase", 
   "permlevel": 0, 
@@ -727,6 +758,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Packed Items", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Packed Item", 
   "permlevel": 0, 
@@ -749,6 +781,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Product Bundle Help", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -769,6 +802,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -790,6 +824,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -813,6 +848,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Net Total (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "net_total", 
   "oldfieldtype": "Currency", 
@@ -836,6 +872,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -857,6 +894,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "currency", 
   "permlevel": 0, 
@@ -880,6 +918,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Net Total", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "currency", 
   "permlevel": 0, 
@@ -902,6 +941,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-money", 
@@ -925,6 +965,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Taxes and Charges", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "charge", 
   "oldfieldtype": "Link", 
@@ -948,6 +989,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -969,6 +1011,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Shipping Rule", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Button", 
   "options": "Shipping Rule", 
@@ -991,6 +1034,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -1012,6 +1056,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Sales Taxes and Charges", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "other_charges", 
   "oldfieldtype": "Table", 
@@ -1036,6 +1081,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Taxes and Charges Calculation", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "HTML", 
   "permlevel": 0, 
@@ -1057,6 +1103,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -1078,6 +1125,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total Taxes and Charges (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "other_charges_total", 
   "oldfieldtype": "Currency", 
@@ -1101,6 +1149,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -1123,6 +1172,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total Taxes and Charges", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "currency", 
   "permlevel": 0, 
@@ -1146,6 +1196,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Additional Discount", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -1169,6 +1220,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Apply Additional Discount On", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "\nGrand Total\nNet Total", 
   "permlevel": 0, 
@@ -1191,6 +1243,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -1212,6 +1265,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Additional Discount Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "currency", 
   "permlevel": 0, 
@@ -1234,6 +1288,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Additional Discount Amount (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -1257,6 +1312,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-money", 
@@ -1280,6 +1336,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Grand Total (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "grand_total", 
   "oldfieldtype": "Currency", 
@@ -1304,6 +1361,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Rounded Total (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "rounded_total", 
   "oldfieldtype": "Currency", 
@@ -1329,6 +1387,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "In Words (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "in_words", 
   "oldfieldtype": "Data", 
@@ -1351,6 +1410,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
@@ -1374,6 +1434,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Grand Total", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "grand_total_export", 
   "oldfieldtype": "Currency", 
@@ -1398,6 +1459,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Rounded Total", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "rounded_total_export", 
   "oldfieldtype": "Currency", 
@@ -1422,6 +1484,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "In Words", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "in_words_export", 
   "oldfieldtype": "Data", 
@@ -1445,6 +1508,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total Advance", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "total_advance", 
   "oldfieldtype": "Currency", 
@@ -1469,6 +1533,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Outstanding Amount", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "outstanding_amount", 
   "oldfieldtype": "Currency", 
@@ -1494,6 +1559,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Advance Payments", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-money", 
@@ -1517,6 +1583,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Get Advances Received", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Button", 
   "options": "get_advances", 
@@ -1540,6 +1607,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Advances", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "advance_adjustment_details", 
   "oldfieldtype": "Table", 
@@ -1566,6 +1634,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Payments", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "icon-money", 
   "permlevel": 0, 
@@ -1588,6 +1657,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Mode of Payment", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "mode_of_payment", 
   "oldfieldtype": "Select", 
@@ -1613,6 +1683,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Cash/Bank Account", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "cash_bank_account", 
   "oldfieldtype": "Link", 
@@ -1637,6 +1708,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -1660,6 +1732,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Paid Amount", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "paid_amount", 
   "oldfieldtype": "Currency", 
@@ -1684,6 +1757,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Paid Amount (Company Currency)", 
+   "length": 0, 
   "no_copy": 1, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -1709,6 +1783,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Write Off", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -1732,6 +1807,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Write Off Amount", 
+   "length": 0, 
   "no_copy": 1, 
   "options": "currency", 
   "permlevel": 0, 
@@ -1754,6 +1830,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Write Off Amount (Company Currency)", 
+   "length": 0, 
   "no_copy": 1, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -1778,6 +1855,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Write Off Outstanding Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -1799,6 +1877,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -1822,6 +1901,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Write Off Account", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Account", 
   "permlevel": 0, 
@@ -1845,6 +1925,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Write Off Cost Center", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Cost Center", 
   "permlevel": 0, 
@@ -1868,6 +1949,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Terms", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "", 
@@ -1891,6 +1973,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Terms", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "tc_name", 
   "oldfieldtype": "Link", 
@@ -1915,6 +1998,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Terms and Conditions Details", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "terms", 
   "oldfieldtype": "Text Editor", 
@@ -1938,6 +2022,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Printing Settings", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -1960,6 +2045,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Letter Head", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "letter_head", 
   "oldfieldtype": "Select", 
@@ -1983,6 +2069,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -2005,6 +2092,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Print Heading", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "select_print_heading", 
   "oldfieldtype": "Link", 
@@ -2030,6 +2118,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "More Information", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "icon-bullhorn", 
   "permlevel": 0, 
@@ -2052,6 +2141,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Project Name", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "project_name", 
   "oldfieldtype": "Link", 
@@ -2077,6 +2167,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Territory", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Territory", 
   "permlevel": 0, 
@@ -2100,6 +2191,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Customer Group", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Customer Group", 
   "permlevel": 0, 
@@ -2121,6 +2213,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -2143,6 +2236,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Customer Address", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Address", 
   "permlevel": 0, 
@@ -2165,6 +2259,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Contact Person", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Contact", 
   "permlevel": 0, 
@@ -2188,6 +2283,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Campaign", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "campaign", 
   "oldfieldtype": "Link", 
@@ -2212,6 +2308,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Source", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "source", 
   "oldfieldtype": "Select", 
@@ -2236,6 +2333,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Accounting Details", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-file-text", 
@@ -2260,6 +2358,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Debit To", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "debit_to", 
   "oldfieldtype": "Link", 
@@ -2284,6 +2383,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Party Account Currency", 
+   "length": 0, 
   "no_copy": 1, 
   "options": "Currency", 
   "permlevel": 0, 
@@ -2309,6 +2409,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Is Opening Entry", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "is_opening", 
   "oldfieldtype": "Select", 
@@ -2333,6 +2434,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "C-Form Applicable", 
+   "length": 0, 
   "no_copy": 1, 
   "options": "No\nYes", 
   "permlevel": 0, 
@@ -2355,6 +2457,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "C-Form No", 
+   "length": 0, 
   "no_copy": 1, 
   "options": "C-Form", 
   "permlevel": 0, 
@@ -2376,6 +2479,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
@@ -2398,6 +2502,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Posting Time", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "posting_time", 
   "oldfieldtype": "Time", 
@@ -2421,6 +2526,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Fiscal Year", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "fiscal_year", 
   "oldfieldtype": "Select", 
@@ -2445,6 +2551,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Remarks", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "remarks", 
   "oldfieldtype": "Text", 
@@ -2469,6 +2576,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Commission", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-group", 
@@ -2492,6 +2600,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Sales Partner", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "sales_partner", 
   "oldfieldtype": "Link", 
@@ -2515,6 +2624,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
@@ -2538,6 +2648,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Commission Rate (%)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "commission_rate", 
   "oldfieldtype": "Currency", 
@@ -2561,6 +2672,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total Commission", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "total_commission", 
   "oldfieldtype": "Currency", 
@@ -2586,6 +2698,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Sales Team", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -2607,6 +2720,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Sales Team1", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "sales_team", 
   "oldfieldtype": "Table", 
@@ -2633,6 +2747,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Recurring", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "icon-time", 
   "permlevel": 0, 
@@ -2654,6 +2769,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -2678,6 +2794,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Is Recurring", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -2701,6 +2818,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Recurring Type", 
+   "length": 0, 
   "no_copy": 1, 
   "options": "\nMonthly\nQuarterly\nHalf-yearly\nYearly", 
   "permlevel": 0, 
@@ -2725,6 +2843,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "From Date", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -2748,6 +2867,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "To Date", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -2771,6 +2891,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Repeat on Day of Month", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -2794,6 +2915,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "End Date", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -2814,6 +2936,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -2838,6 +2961,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Next Date", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -2861,6 +2985,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Recurring Id", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -2884,6 +3009,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Notification Email Address", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -2906,6 +3032,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Recurring Print Format", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Print Format", 
   "permlevel": 0, 
@@ -2929,6 +3056,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Against Income Account", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "against_income_account", 
   "oldfieldtype": "Small Text", 
@@ -2951,7 +3079,8 @@
 "is_submittable": 1, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2015-10-26 12:12:40.616546", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:55.906783", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Sales Invoice", 
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -155,7 +155,7 @@ class SalesInvoice(SellingController):
 				'second_join_field': 'so_detail',
 				'overflow_type': 'delivery',
 				'extra_cond': """ and exists(select name from `tabSales Invoice`
-					where name=`tabSales Invoice Item`.parent and ifnull(update_stock, 0) = 1)"""
+					where name=`tabSales Invoice Item`.parent and update_stock = 1)"""
 			},
 			{
 				'source_dt': 'Sales Invoice Item',
@@ -359,8 +359,8 @@ class SalesInvoice(SellingController):
 		"""check for does customer belong to same project as entered.."""
 		if self.project_name and self.customer:
 			res = frappe.db.sql("""select name from `tabProject`
-				where name = %s and (customer = %s or
-					ifnull(customer,'')='')""", (self.project_name, self.customer))
+				where name = %s and (customer = %s or customer is null or customer = '')""",
+				(self.project_name, self.customer))
 			if not res:
 				throw(_("Customer {0} does not belong to project {1}").format(self.customer,self.project_name))

@@ -379,6 +379,8 @@ class SalesInvoice(SellingController):
 				msgprint(_("Item Code required at Row No {0}").format(d.idx), raise_exception=True)

 	def validate_warehouse(self):
+		super(SalesInvoice, self).validate_warehouse()
+		
 		for d in self.get('items'):
 			if not d.warehouse:
 				frappe.throw(_("Warehouse required at Row No {0}").format(d.idx))
@@ -434,7 +436,7 @@ class SalesInvoice(SellingController):

 		if not warehouse:
 			global_pos_profile = frappe.db.sql("""select name, warehouse from `tabPOS Profile`
-				where ifnull(user,'') = '' and company = %s""", self.company)
+				where (user is null or user = '') and company = %s""", self.company)

 			if global_pos_profile:
 				warehouse = global_pos_profile[0][1]
--- a/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
+++ b/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
@@ -18,6 +18,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Journal Entry", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "journal_voucher", 
   "oldfieldtype": "Link", 
@@ -44,6 +45,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Remarks", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "remarks", 
   "oldfieldtype": "Small Text", 
@@ -69,6 +71,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Journal Entry Detail No", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "jv_detail_no", 
   "oldfieldtype": "Data", 
@@ -93,6 +96,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -114,6 +118,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Advance amount", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "advance_amount", 
   "oldfieldtype": "Currency", 
@@ -140,6 +145,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Allocated amount", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "allocated_amount", 
   "oldfieldtype": "Currency", 
@@ -164,7 +170,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 1, 
- "modified": "2015-10-02 07:39:09.979547", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:56.263776", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Sales Invoice Advance", 
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -19,6 +19,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Barcode", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -40,6 +41,7 @@
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Item", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "item_code", 
   "oldfieldtype": "Link", 
@@ -63,6 +65,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -84,6 +87,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Item Name", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "item_name", 
   "oldfieldtype": "Data", 
@@ -107,6 +111,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Customer's Item Code", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -128,6 +133,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Edit Description", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -150,6 +156,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Description", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "description", 
   "oldfieldtype": "Text", 
@@ -174,6 +181,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -196,6 +204,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Image View", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "image", 
   "permlevel": 0, 
@@ -219,6 +228,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Image", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -241,6 +251,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -262,6 +273,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Quantity", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "qty", 
   "oldfieldtype": "Currency", 
@@ -285,6 +297,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Price List Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "ref_rate", 
   "oldfieldtype": "Currency", 
@@ -310,6 +323,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Discount on Price List Rate (%)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "adj_rate", 
   "oldfieldtype": "Float", 
@@ -332,6 +346,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -353,6 +368,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "UOM", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "UOM", 
   "permlevel": 0, 
@@ -375,6 +391,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Price List Rate (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "base_ref_rate", 
   "oldfieldtype": "Currency", 
@@ -398,6 +415,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -419,6 +437,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "export_rate", 
   "oldfieldtype": "Currency", 
@@ -443,6 +462,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "export_amount", 
   "oldfieldtype": "Currency", 
@@ -466,6 +486,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -487,6 +508,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Rate (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "basic_rate", 
   "oldfieldtype": "Currency", 
@@ -511,6 +533,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Amount (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "amount", 
   "oldfieldtype": "Currency", 
@@ -535,6 +558,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Pricing Rule", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Pricing Rule", 
   "permlevel": 0, 
@@ -556,6 +580,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -578,6 +603,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Net Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "currency", 
   "permlevel": 0, 
@@ -601,6 +627,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Net Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "currency", 
   "permlevel": 0, 
@@ -623,6 +650,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -645,6 +673,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Net Rate (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -668,6 +697,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Net Amount (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -692,6 +722,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Drop Ship", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -714,6 +745,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Delivered By Supplier", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -736,6 +768,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Accounting Details", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -757,6 +790,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Income Account", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "income_account", 
   "oldfieldtype": "Link", 
@@ -783,6 +817,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Expense Account", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Account", 
   "permlevel": 0, 
@@ -805,6 +840,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -827,6 +863,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Cost Center", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "cost_center", 
   "oldfieldtype": "Link", 
@@ -854,6 +891,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Stock Details", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -875,6 +913,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Warehouse", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "warehouse", 
   "oldfieldtype": "Link", 
@@ -899,6 +938,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Target Warehouse", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Warehouse", 
   "permlevel": 0, 
@@ -922,6 +962,7 @@
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Serial No", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "serial_no", 
   "oldfieldtype": "Small Text", 
@@ -945,6 +986,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Batch No", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Batch", 
   "permlevel": 0, 
@@ -968,6 +1010,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Item Group", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "item_group", 
   "oldfieldtype": "Link", 
@@ -992,6 +1035,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Brand Name", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "brand", 
   "oldfieldtype": "Data", 
@@ -1015,6 +1059,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Item Tax Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "item_tax_rate", 
   "oldfieldtype": "Small Text", 
@@ -1037,6 +1082,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -1058,6 +1104,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Available Batch Qty at Warehouse", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "precision": "", 
@@ -1082,6 +1129,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Available Qty at Warehouse", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "actual_qty", 
   "oldfieldtype": "Currency", 
@@ -1105,6 +1153,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "References", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -1127,6 +1176,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Time Log Batch", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Time Log Batch", 
   "permlevel": 0, 
@@ -1149,6 +1199,7 @@
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Sales Order", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "sales_order", 
   "oldfieldtype": "Link", 
@@ -1173,6 +1224,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Sales Order Item", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "so_detail", 
   "oldfieldtype": "Data", 
@@ -1195,6 +1247,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -1217,6 +1270,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Delivery Note", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "delivery_note", 
   "oldfieldtype": "Link", 
@@ -1241,6 +1295,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Delivery Note Item", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "dn_detail", 
   "oldfieldtype": "Data", 
@@ -1264,6 +1319,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Delivered Qty", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "delivered_qty", 
   "oldfieldtype": "Currency", 
@@ -1286,6 +1342,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -1308,6 +1365,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Page Break", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -1327,7 +1385,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 1, 
- "modified": "2015-11-02 15:14:02.306067", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:56.335017", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Sales Invoice Item", 
--- a/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
+++ b/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
@@ -18,7 +18,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
-   "label": "Type",  
+   "label": "Type", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "charge_type", 
   "oldfieldtype": "Select", 
@@ -44,6 +45,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Reference Row #", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "row_id", 
   "oldfieldtype": "Data", 
@@ -67,6 +69,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Account Head", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "account_head", 
   "oldfieldtype": "Link", 
@@ -92,6 +95,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Cost Center", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "cost_center_other_charges", 
   "oldfieldtype": "Link", 
@@ -115,6 +119,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -137,6 +142,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Description", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "description", 
   "oldfieldtype": "Small Text", 
@@ -163,6 +169,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Is this Tax included in Basic Rate?", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -185,6 +192,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -207,6 +215,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "rate", 
   "oldfieldtype": "Currency", 
@@ -229,6 +238,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -251,6 +261,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "currency", 
   "permlevel": 0, 
@@ -274,6 +285,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "currency", 
   "permlevel": 0, 
@@ -297,6 +309,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Tax Amount After Discount Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "currency", 
   "permlevel": 0, 
@@ -319,6 +332,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -341,6 +355,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Amount (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "tax_amount", 
   "oldfieldtype": "Currency", 
@@ -365,6 +380,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "total", 
   "oldfieldtype": "Currency", 
@@ -390,6 +406,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Tax Amount After Discount Amount (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -412,6 +429,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Item Wise Tax Detail", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "item_wise_tax_detail", 
   "oldfieldtype": "Small Text", 
@@ -435,6 +453,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Parenttype", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "parenttype", 
   "oldfieldtype": "Data", 
@@ -456,7 +475,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 1, 
- "modified": "2015-10-02 07:39:11.977789", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:57.263576", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Sales Taxes and Charges", 
--- a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
+++ b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
@@ -21,6 +21,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Title", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "title", 
   "oldfieldtype": "Data", 
@@ -44,6 +45,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Default", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -65,6 +67,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Disabled", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -86,6 +89,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -107,6 +111,7 @@
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Company", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "company", 
   "oldfieldtype": "Link", 
@@ -130,6 +135,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -152,6 +158,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Sales Taxes and Charges", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "other_charges", 
   "oldfieldtype": "Table", 
@@ -175,7 +182,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2015-10-02 07:39:12.157257", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:57.346680", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Sales Taxes and Charges Template", 
--- a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py
+++ b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py
@@ -16,7 +16,7 @@ def valdiate_taxes_and_charges_template(doc):

 	if doc.is_default == 1:
 		frappe.db.sql("""update `tab{0}` set is_default = 0
-			where ifnull(is_default,0) = 1 and name != %s and company = %s""".format(doc.doctype),
+			where is_default = 1 and name != %s and company = %s""".format(doc.doctype),
 			(doc.name, doc.company))

 	for tax in doc.get("taxes"):
--- a/erpnext/accounts/doctype/shipping_rule/shipping_rule.json
+++ b/erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -21,6 +21,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Shipping Rule Label", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -42,6 +43,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Disabled", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -64,7 +66,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
-   "label": "Calculate Based On",  
+   "label": "Calculate Based On", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Net Total\nNet Weight", 
   "permlevel": 0, 
@@ -88,6 +91,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Shipping Rule Conditions", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -109,6 +113,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Shipping Rule Conditions", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Shipping Rule Condition", 
   "permlevel": 0, 
@@ -132,6 +137,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Valid for Countries", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -153,6 +159,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Worldwide Shipping", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -176,6 +183,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Valid for Countries", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Shipping Rule Country", 
   "permlevel": 0, 
@@ -199,6 +207,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -220,6 +229,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Company", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company", 
   "permlevel": 0, 
@@ -241,6 +251,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -262,6 +273,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Shipping Account", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Account", 
   "permlevel": 0, 
@@ -284,6 +296,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Cost Center", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Cost Center", 
   "permlevel": 0, 
@@ -305,7 +318,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2015-10-02 07:39:12.778062", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:57.633071", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Shipping Rule", 
--- a/erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.json
+++ b/erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.json
@@ -19,6 +19,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "From Value", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -40,6 +41,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "To Value", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -61,6 +63,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Shipping Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -81,7 +84,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 1, 
- "modified": "2015-10-02 07:39:12.974539", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:57.700694", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Shipping Rule Condition", 
--- a/erpnext/accounts/doctype/shipping_rule_country/shipping_rule_country.json
+++ b/erpnext/accounts/doctype/shipping_rule_country/shipping_rule_country.json
@@ -19,6 +19,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Country", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Country", 
   "permlevel": 0, 
@@ -39,7 +40,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 1, 
- "modified": "2015-10-02 07:39:13.035775", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:57.731755", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Shipping Rule Country", 
--- a/erpnext/accounts/doctype/tax_rule/tax_rule.json
+++ b/erpnext/accounts/doctype/tax_rule/tax_rule.json
@@ -20,7 +20,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
-   "label": "Tax Type",  
+   "label": "Tax Type", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Sales\nPurchase", 
   "permlevel": 0, 
@@ -44,6 +45,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Use for Shopping Cart", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -65,6 +67,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -88,6 +91,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Sales Tax Template", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Sales Taxes and Charges Template", 
   "permlevel": 0, 
@@ -112,6 +116,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Purchase Tax Template", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Purchase Taxes and Charges Template", 
   "permlevel": 0, 
@@ -135,6 +140,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Filters", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -158,6 +164,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Customer", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Customer", 
   "permlevel": 0, 
@@ -182,6 +189,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Supplier", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Supplier", 
   "permlevel": 0, 
@@ -205,6 +213,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Billing City", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -227,6 +236,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Billing State", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -249,6 +259,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Billing Country", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Country", 
   "permlevel": 0, 
@@ -271,6 +282,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -294,6 +306,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Customer Group", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Customer Group", 
   "permlevel": 0, 
@@ -318,6 +331,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Supplier Type", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Supplier Type", 
   "permlevel": 0, 
@@ -341,6 +355,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Shipping City", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -363,6 +378,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Shipping State", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -385,6 +401,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Shipping Country", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Country", 
   "permlevel": 0, 
@@ -408,6 +425,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Validity", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -430,6 +448,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "From Date", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -451,6 +470,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -473,6 +493,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "To Date", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -494,6 +515,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -517,6 +539,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Priority", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -538,6 +561,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -560,6 +584,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Company", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company", 
   "permlevel": 0, 
@@ -580,7 +605,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2015-10-02 07:39:16.298546", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:59.201327", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Tax Rule", 
--- a/erpnext/accounts/general_ledger.py
+++ b/erpnext/accounts/general_ledger.py
@@ -27,25 +27,25 @@ def process_gl_map(gl_map, merge_entries=True):
 		gl_map = merge_similar_entries(gl_map)

 	for entry in gl_map:
-		# toggle debit, credit if negative entry		
+		# toggle debit, credit if negative entry
 		if flt(entry.debit) < 0:
 			entry.credit = flt(entry.credit) - flt(entry.debit)
 			entry.debit = 0.0
-			
+
 		if flt(entry.debit_in_account_currency) < 0:
 			entry.credit_in_account_currency = \
 				flt(entry.credit_in_account_currency) - flt(entry.debit_in_account_currency)
 			entry.debit_in_account_currency = 0.0
-		
+
 		if flt(entry.credit) < 0:
 			entry.debit = flt(entry.debit) - flt(entry.credit)
 			entry.credit = 0.0
-			
+
 		if flt(entry.credit_in_account_currency) < 0:
 			entry.debit_in_account_currency = \
 				flt(entry.debit_in_account_currency) - flt(entry.credit_in_account_currency)
 			entry.credit_in_account_currency = 0.0
-			
+
 	return gl_map

 def merge_similar_entries(gl_map):
@@ -81,7 +81,7 @@ def check_if_in_list(gle, gl_map):
 def save_entries(gl_map, adv_adj, update_outstanding):
 	validate_account_for_auto_accounting_for_stock(gl_map)
 	round_off_debit_credit(gl_map)
-	
+
 	for entry in gl_map:
 		make_entry(entry, adv_adj, update_outstanding)
 		# check against budget
@@ -99,7 +99,7 @@ def validate_account_for_auto_accounting_for_stock(gl_map):
 	if cint(frappe.db.get_single_value("Accounts Settings", "auto_accounting_for_stock")) \
 		and gl_map[0].voucher_type=="Journal Entry":
 			aii_accounts = [d[0] for d in frappe.db.sql("""select name from tabAccount
-				where account_type = 'Warehouse' and ifnull(warehouse, '')!=''""")]
+				where account_type = 'Warehouse' and (warehouse != '' and warehouse is not null)""")]

 			for entry in gl_map:
 				if entry.account in aii_accounts:
@@ -109,36 +109,36 @@ def validate_account_for_auto_accounting_for_stock(gl_map):
 def round_off_debit_credit(gl_map):
 	precision = get_field_precision(frappe.get_meta("GL Entry").get_field("debit"),
 		currency=frappe.db.get_value("Company", gl_map[0].company, "default_currency", cache=True))
-	
+
 	debit_credit_diff = 0.0
 	for entry in gl_map:
 		entry.debit = flt(entry.debit, precision)
 		entry.credit = flt(entry.credit, precision)
 		debit_credit_diff += entry.debit - entry.credit
-	
+
 	debit_credit_diff = flt(debit_credit_diff, precision)
 	if abs(debit_credit_diff) >= (5.0 / (10**precision)):
 		frappe.throw(_("Debit and Credit not equal for {0} #{1}. Difference is {2}.")
 			.format(gl_map[0].voucher_type, gl_map[0].voucher_no, debit_credit_diff))
-		
+
 	elif abs(debit_credit_diff) >= (1.0 / (10**precision)):
 		make_round_off_gle(gl_map, debit_credit_diff)
-		
+
 def make_round_off_gle(gl_map, debit_credit_diff):
-	round_off_account, round_off_cost_center = frappe.db.get_value("Company", gl_map[0].company, 
+	round_off_account, round_off_cost_center = frappe.db.get_value("Company", gl_map[0].company,
 		["round_off_account", "round_off_cost_center"]) or [None, None]
 	if not round_off_account:
 		frappe.throw(_("Please mention Round Off Account in Company"))
-		
+
 	if not round_off_cost_center:
 		frappe.throw(_("Please mention Round Off Cost Center in Company"))
-		
-	
+
+
 	round_off_gle = frappe._dict()
-	for k in ["voucher_type", "voucher_no", "company", 
+	for k in ["voucher_type", "voucher_no", "company",
 		"posting_date", "remarks", "fiscal_year", "is_opening"]:
 			round_off_gle[k] = gl_map[0][k]
-	
+
 	round_off_gle.update({
 		"account": round_off_account,
 		"debit": abs(debit_credit_diff) if debit_credit_diff < 0 else 0,
@@ -149,7 +149,7 @@ def make_round_off_gle(gl_map, debit_credit_diff):
 		"against_voucher_type": None,
 		"against_voucher": None
 	})
-	
+
 	gl_map.append(round_off_gle)


--- a/erpnext/accounts/page/accounts_browser/accounts_browser.py
+++ b/erpnext/accounts/page/accounts_browser/accounts_browser.py
@@ -25,9 +25,9 @@ def get_children():
 		acc = frappe.db.sql(""" select
 			name as value, is_group as expandable %s
 			from `tab%s`
-			where ifnull(parent_%s,'') = ''
+			where ifnull(`parent_%s`,'') = ''
 			and `company` = %s	and docstatus<2
-			order by name""" % (select_cond, ctype, ctype.lower().replace(' ','_'), '%s'),
+			order by name""" % (select_cond, frappe.db.escape(ctype), frappe.db.escape(ctype.lower().replace(' ','_')), '%s'),
 				company, as_dict=1)

 		if args["parent"]=="Accounts":
@@ -38,9 +38,9 @@ def get_children():
 		acc = frappe.db.sql("""select
 			name as value, is_group as expandable %s
 	 		from `tab%s`
-			where ifnull(parent_%s,'') = %s
+			where ifnull(`parent_%s`,'') = %s
 			and docstatus<2
-			order by name""" % (select_cond, ctype, ctype.lower().replace(' ','_'), '%s'),
+			order by name""" % (select_cond, frappe.db.escape(ctype), frappe.db.escape(ctype.lower().replace(' ','_')), '%s'),
 				args['parent'], as_dict=1)

 	if ctype == 'Account':
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -35,7 +35,7 @@ def _get_party_details(party=None, account=None, party_type="Customer", company=
 	party = out[party_type.lower()]

 	if not ignore_permissions and not frappe.has_permission(party_type, "read", party):
-		frappe.throw(_("Not permitted"), frappe.PermissionError)
+		frappe.throw(_("Not permitted for {0}").format(party), frappe.PermissionError)

 	party = frappe.get_doc(party_type, party)

--- a/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html
+++ b/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html
@@ -0,0 +1,30 @@
+{%- from "templates/print_formats/standard_macros.html" import add_header -%}
+<div class="page-break">
+    {%- if not doc.get("print_heading") and not doc.get("select_print_heading")
+        and doc.set("select_print_heading", _("Payment Receipt Note")) -%}{%- endif -%}
+    {{ add_header(0, 1, doc, letter_head, no_letterhead) }}
+
+    {%- for label, value in (
+        (_("Received On"), frappe.utils.formatdate(doc.voucher_date)),
+        (_("Received From"), doc.pay_to_recd_from),
+        (_("Amount"), "<strong>" + doc.get_formatted("total_amount") + "</strong><br>" + (doc.total_amount_in_words or "") + "<br>"),
+        (_("Remarks"), doc.remark)
+    ) -%}
+    <div class="row">
+        <div class="col-xs-3"><label class="text-right">{{ label }}</label></div>
+        <div class="col-xs-9">{{ value }}</div>
+    </div>
+
+    {%- endfor -%}
+
+    <hr>
+    <br>
+    <p class="strong">
+        {{ _("For") }} {{ doc.company }},<br>
+        <br>
+        <br>
+        <br>
+        {{ _("Authorized Signatory") }}
+    </p>
+</div>
+
--- a/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.json
+++ b/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.json
@@ -1,15 +1,17 @@
 {
- "creation": "2012-05-01 12:46:31",
- "doc_type": "Journal Entry",
- "docstatus": 0,
- "doctype": "Print Format",
- "html": "{%- from \"templates/print_formats/standard_macros.html\" import add_header -%}\n<div class=\"page-break\">\n    {%- if not doc.get(\"print_heading\") and not doc.get(\"select_print_heading\") \n        and doc.set(\"select_print_heading\", _(\"Payment Receipt Note\")) -%}{%- endif -%}\n    {{ add_header(0, 1, doc, letter_head, no_letterhead) }}\n\n    {%- for label, value in (\n        (_(\"Received On\"), frappe.utils.formatdate(doc.voucher_date)),\n        (_(\"Received From\"), doc.pay_to_recd_from),\n        (_(\"Amount\"), \"<strong>\" + doc.get_formatted(\"total_amount\") + \"</strong><br>\" + (doc.total_amount_in_words or \"\") + \"<br>\"),\n        (_(\"Remarks\"), doc.remark)\n    ) -%}\n    <div class=\"row\">\n        <div class=\"col-xs-3\"><label class=\"text-right\">{{ label }}</label></div>\n        <div class=\"col-xs-9\">{{ value }}</div>\n    </div>\n\n    {%- endfor -%}\n\n    <hr>\n    <br>\n    <p class=\"strong\">\n        {{ _(\"For\") }} {{ doc.company }},<br>\n        <br>\n        <br>\n        <br>\n        {{ _(\"Authorized Signatory\") }}\n    </p>\n</div>\n\n",
- "idx": 1,
- "modified": "2015-01-16 11:03:22.893209",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Payment Receipt Voucher",
- "owner": "Administrator",
- "print_format_type": "Server",
+ "creation": "2012-05-01 12:46:31", 
+ "custom_format": 0, 
+ "disabled": 0, 
+ "doc_type": "Journal Entry", 
+ "docstatus": 0, 
+ "doctype": "Print Format", 
+ "html": "", 
+ "idx": 1, 
+ "modified": "2015-11-25 07:06:00.668141", 
+ "modified_by": "Administrator", 
+ "name": "Payment Receipt Voucher", 
+ "owner": "Administrator", 
+ "print_format_builder": 0, 
+ "print_format_type": "Server", 
 "standard": "Yes"
-}
+}
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -216,7 +216,7 @@ class ReceivablePayableReport(object):
 			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 ifnull(party, '') != '' {1}
+				where docstatus < 2 and party_type=%s and (party is not null and party != '') {1}
 				order by posting_date, party"""
 				.format(select_fields, conditions), values, as_dict=True)

--- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
+++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
@@ -24,7 +24,7 @@ def execute(filters=None):
 		total_credit += flt(d[3])

 	amounts_not_reflected_in_system = frappe.db.sql("""
-		select sum(ifnull(jvd.debit_in_account_currency, 0) - ifnull(jvd.credit_in_account_currency, 0))
+		select sum(jvd.debit_in_account_currency - jvd.credit_in_account_currency)
 		from `tabJournal Entry Account` jvd, `tabJournal Entry` jv
 		where jvd.parent = jv.name and jv.docstatus=1 and jvd.account=%s
 		and jv.posting_date > %s and jv.clearance_date <= %s and ifnull(jv.is_opening, 'No') = 'No'
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@ -102,15 +102,15 @@ def get_result(filters, account_details):
 	return result

 def get_gl_entries(filters):
-	select_fields = """, sum(ifnull(debit_in_account_currency, 0)) as debit_in_account_currency,
-		sum(ifnull(credit_in_account_currency, 0)) as credit_in_account_currency""" \
+	select_fields = """, sum(debit_in_account_currency) as debit_in_account_currency,
+		sum(credit_in_account_currency) as credit_in_account_currency""" \
 		if filters.get("show_in_account_currency") else ""

 	group_by_condition = "group by voucher_type, voucher_no, account, cost_center" \
 		if filters.get("group_by_voucher") else "group by name"

 	gl_entries = frappe.db.sql("""select posting_date, account, party_type, party,
-			sum(ifnull(debit, 0)) as debit, sum(ifnull(credit, 0)) as credit,
+			sum(debit) as debit, sum(credit) as credit,
 			voucher_type, voucher_no, cost_center, remarks, against, is_opening {select_fields}
 		from `tabGL Entry`
 		where company=%(company)s {conditions}
--- a/erpnext/accounts/report/gross_profit/gross_profit.py
+++ b/erpnext/accounts/report/gross_profit/gross_profit.py
@@ -208,7 +208,7 @@ class GrossProfitGenerator(object):
 			else:
 				self.average_buying_rate[item_code] = flt(frappe.db.sql("""select avg(valuation_rate)
 					from `tabStock Ledger Entry`
-					where item_code = %s and ifnull(qty_after_transaction,0) > 0""", item_code)[0][0])
+					where item_code = %s and qty_after_transaction > 0""", item_code)[0][0])

 		return self.average_buying_rate[item_code]

--- a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
+++ b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
@@ -88,7 +88,7 @@ def get_tax_accounts(item_list, columns):

 	tax_details = frappe.db.sql("""select parent, account_head, item_wise_tax_detail, charge_type, base_tax_amount_after_discount_amount
 		from `tabPurchase Taxes and Charges` where parenttype = 'Purchase Invoice'
-		and docstatus = 1 and ifnull(account_head, '') != '' and category in ('Total', 'Valuation and Total')
+		and docstatus = 1 and (account_head is not null and account_head != '') and category in ('Total', 'Valuation and Total')
 		and parent in (%s)""" % ', '.join(['%s']*len(invoice_wise_items)), tuple(invoice_wise_items.keys()))

 	for parent, account_head, item_wise_tax_detail, charge_type, tax_amount in tax_details:
--- 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
@@ -86,7 +86,7 @@ def get_tax_accounts(item_list, columns):
 	tax_details = frappe.db.sql("""select parent, account_head, item_wise_tax_detail,
 		charge_type, base_tax_amount_after_discount_amount
 		from `tabSales Taxes and Charges` where parenttype = 'Sales Invoice'
-		and docstatus = 1 and ifnull(account_head, '') != ''
+		and docstatus = 1 and (account_head is not null and account_head != '')
 		and parent in (%s)""" % ', '.join(['%s']*len(invoice_wise_items)),
 		tuple(invoice_wise_items.keys()))

--- a/erpnext/accounts/report/purchase_register/purchase_register.py
+++ b/erpnext/accounts/report/purchase_register/purchase_register.py
@@ -29,7 +29,7 @@ def execute(filters=None):
 		purchase_receipt = list(set(invoice_po_pr_map.get(inv.name, {}).get("purchase_receipt", [])))
 		project_name = list(set(invoice_po_pr_map.get(inv.name, {}).get("project_name", [])))

-		row = [inv.name, inv.posting_date, inv.supplier, inv.supplier_name, 
+		row = [inv.name, inv.posting_date, inv.supplier, inv.supplier_name,
 			supplier_details.get(inv.supplier),
 			inv.credit_to, ", ".join(project_name), inv.bill_no, inv.bill_date, inv.remarks,
 			", ".join(purchase_order), ", ".join(purchase_receipt)]
@@ -54,7 +54,7 @@ def execute(filters=None):

 		# total tax, grand total, outstanding amount & rounded total
 		row += [total_tax, inv.base_grand_total, flt(inv.base_grand_total, 2), inv.outstanding_amount]
-		data.append(row)		
+		data.append(row)

 	return columns, data

@@ -71,13 +71,15 @@ def get_columns(invoice_list):

 	if invoice_list:
 		expense_accounts = frappe.db.sql_list("""select distinct expense_account
-			from `tabPurchase Invoice Item` where docstatus = 1 and ifnull(expense_account, '') != ''
+			from `tabPurchase Invoice Item` where docstatus = 1
+			and (expense_account is not null and expense_account != '')
 			and parent in (%s) order by expense_account""" %
 			', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]))

 		tax_accounts = 	frappe.db.sql_list("""select distinct account_head
 			from `tabPurchase Taxes and Charges` where parenttype = 'Purchase Invoice'
-			and docstatus = 1 and ifnull(account_head, '') != '' and category in ('Total', 'Valuation and Total')
+			and docstatus = 1 and (account_head is not null and account_head != '')
+			and category in ('Total', 'Valuation and Total')
 			and parent in (%s) order by account_head""" %
 			', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]))

@@ -143,7 +145,7 @@ def get_invoice_tax_map(invoice_list, invoice_expense_map, expense_accounts):
 	return invoice_expense_map, invoice_tax_map

 def get_invoice_po_pr_map(invoice_list):
-	pi_items = frappe.db.sql("""select parent, purchase_order, purchase_receipt, po_detail, 
+	pi_items = frappe.db.sql("""select parent, purchase_order, purchase_receipt, po_detail,
 		project_name from `tabPurchase Invoice Item` where parent in (%s)
 		and (ifnull(purchase_order, '') != '' or ifnull(purchase_receipt, '') != '')""" %
 		', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]), as_dict=1)
--- a/erpnext/accounts/report/sales_register/sales_register.py
+++ b/erpnext/accounts/report/sales_register/sales_register.py
@@ -79,7 +79,7 @@ def get_columns(invoice_list):

 		tax_accounts = 	frappe.db.sql_list("""select distinct account_head
 			from `tabSales Taxes and Charges` where parenttype = 'Sales Invoice'
-			and docstatus = 1 and ifnull(base_tax_amount_after_discount_amount, 0) != 0
+			and docstatus = 1 and base_tax_amount_after_discount_amount != 0
 			and parent in (%s) order by account_head""" %
 			', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]))

--- a/erpnext/accounts/report/trial_balance/trial_balance.py
+++ b/erpnext/accounts/report/trial_balance/trial_balance.py
@@ -85,7 +85,7 @@ def get_rootwise_opening_balances(filters, report_type):
 		
 	gle = frappe.db.sql("""
 		select 
-			account, sum(ifnull(debit, 0)) as opening_debit, sum(ifnull(credit, 0)) as opening_credit 
+			account, sum(debit) as opening_debit, sum(credit) as opening_credit 
 		from `tabGL Entry`
 		where 
 			company=%(company)s
--- a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py
+++ b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py
@@ -76,7 +76,7 @@ def get_data(filters, show_party_name):
 	
 def get_opening_balances(filters):
 	gle = frappe.db.sql("""
-		select party, sum(ifnull(debit, 0)) as opening_debit, sum(ifnull(credit, 0)) as opening_credit 
+		select party, sum(debit) as opening_debit, sum(credit) as opening_credit 
 		from `tabGL Entry`
 		where company=%(company)s 
 			and ifnull(party_type, '') = %(party_type)s and ifnull(party, '') != ''
@@ -96,7 +96,7 @@ def get_opening_balances(filters):
 	
 def get_balances_within_period(filters):
 	gle = frappe.db.sql("""
-		select party, sum(ifnull(debit, 0)) as debit, sum(ifnull(credit, 0)) as credit 
+		select party, sum(debit) as debit, sum(credit) as credit 
 		from `tabGL Entry`
 		where company=%(company)s 
 			and ifnull(party_type, '') = %(party_type)s and ifnull(party, '') != ''
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -21,7 +21,7 @@ def get_fiscal_year(date=None, fiscal_year=None, label="Date", verbose=1, compan

 def get_fiscal_years(transaction_date=None, fiscal_year=None, label="Date", verbose=1, company=None):
 	# if year start date is 2012-04-01, year end date should be 2013-03-31 (hence subdate)
-	cond = " ifnull(disabled, 0) = 0"
+	cond = " disabled = 0"
 	if fiscal_year:
 		cond += " and fy.name = %(fiscal_year)s"
 	else:
@@ -65,7 +65,7 @@ def get_balance_on(account=None, date=None, party_type=None, party=None, in_acco

 	cond = []
 	if date:
-		cond.append("posting_date <= '%s'" % date)
+		cond.append("posting_date <= '%s'" % frappe.db.escape(cstr(date)))
 	else:
 		# get balance of all entries that exist
 		date = nowdate()
@@ -105,17 +105,17 @@ def get_balance_on(account=None, date=None, party_type=None, party=None, in_acco
 			if acc.account_currency == frappe.db.get_value("Company", acc.company, "default_currency"):
 				in_account_currency = False
 		else:
-			cond.append("""gle.account = "%s" """ % (account.replace('"', '\\"'), ))
+			cond.append("""gle.account = "%s" """ % (frappe.db.escape(account), ))

 	if party_type and party:
 		cond.append("""gle.party_type = "%s" and gle.party = "%s" """ %
-			(party_type.replace('"', '\\"'), party.replace('"', '\\"')))
+			(frappe.db.escape(party_type), frappe.db.escape(party)))

 	if account or (party_type and party):
 		if in_account_currency:
-			select_field = "sum(ifnull(debit_in_account_currency, 0)) - sum(ifnull(credit_in_account_currency, 0))"
+			select_field = "sum(debit_in_account_currency) - sum(credit_in_account_currency)"
 		else:
-			select_field = "sum(ifnull(debit, 0)) - sum(ifnull(credit, 0))"
+			select_field = "sum(debit) - sum(credit)"
 		bal = frappe.db.sql("""
 			SELECT {0}
 			FROM `tabGL Entry` gle
@@ -181,7 +181,7 @@ def check_if_jv_modified(args):
 		select t2.{dr_or_cr} from `tabJournal Entry` t1, `tabJournal Entry Account` t2
 		where t1.name = t2.parent and t2.account = %(account)s
 		and t2.party_type = %(party_type)s and t2.party = %(party)s
-		and ifnull(t2.reference_type, '') in ("", "Sales Order", "Purchase Order")
+		and (t2.reference_type is null or t2.reference_type in ("", "Sales Order", "Purchase Order"))
 		and t1.name = %(voucher_no)s and t2.name = %(voucher_detail_no)s
 		and t1.docstatus=1 """.format(dr_or_cr = args.get("dr_or_cr")), args)

@@ -282,7 +282,7 @@ def fix_total_debit_credit():
 		sum(debit) - sum(credit) as diff
 		from `tabGL Entry`
 		group by voucher_type, voucher_no
-		having sum(ifnull(debit, 0)) != sum(ifnull(credit, 0))""", as_dict=1)
+		having sum(debit) != sum(credit)""", as_dict=1)

 	for d in vouchers:
 		if abs(d.diff) > 0:
@@ -301,7 +301,7 @@ def get_stock_and_account_difference(account_list=None, posting_date=None):
 	difference = {}

 	account_warehouse = dict(frappe.db.sql("""select name, warehouse from tabAccount
-		where account_type = 'Warehouse' and ifnull(warehouse, '') != ''
+		where account_type = 'Warehouse' and (warehouse is not null and warehouse != '')
 		and name in (%s)""" % ', '.join(['%s']*len(account_list)), account_list))

 	for account, warehouse in account_warehouse.items():
@@ -372,7 +372,7 @@ def get_actual_expense(args):
 		if args.get("month_end_date") else ""

 	return flt(frappe.db.sql("""
-		select sum(ifnull(debit, 0)) - sum(ifnull(credit, 0))
+		select sum(debit) - sum(credit)
 		from `tabGL Entry`
 		where account='%(account)s' and cost_center='%(cost_center)s'
 		and fiscal_year='%(fiscal_year)s' and company='%(company)s' %(condition)s
@@ -392,14 +392,14 @@ def get_stock_rbnb_difference(posting_date, company):
 		from `tabStock Ledger Entry` where company=%s""", company)

 	pr_valuation_amount = frappe.db.sql("""
-		select sum(ifnull(pr_item.valuation_rate, 0) * ifnull(pr_item.qty, 0) * ifnull(pr_item.conversion_factor, 0))
+		select sum(pr_item.valuation_rate * pr_item.qty * pr_item.conversion_factor)
 		from `tabPurchase Receipt Item` pr_item, `tabPurchase Receipt` pr
 	    where pr.name = pr_item.parent and pr.docstatus=1 and pr.company=%s
 		and pr.posting_date <= %s and pr_item.item_code in (%s)""" %
 	    ('%s', '%s', ', '.join(['%s']*len(stock_items))), tuple([company, posting_date] + stock_items))[0][0]

 	pi_valuation_amount = frappe.db.sql("""
-		select sum(ifnull(pi_item.valuation_rate, 0) * ifnull(pi_item.qty, 0) * ifnull(pi_item.conversion_factor, 0))
+		select sum(pi_item.valuation_rate * pi_item.qty * pi_item.conversion_factor)
 		from `tabPurchase Invoice Item` pi_item, `tabPurchase Invoice` pi
 	    where pi.name = pi_item.parent and pi.docstatus=1 and pi.company=%s
 		and pi.posting_date <= %s and pi_item.item_code in (%s)""" %
@@ -420,18 +420,18 @@ def get_outstanding_invoices(party_type, party, account, condition=None):
 	precision = frappe.get_precision("Sales Invoice", "outstanding_amount")

 	if party_type=="Customer":
-		dr_or_cr = "ifnull(debit_in_account_currency, 0) - ifnull(credit_in_account_currency, 0)"
-		payment_dr_or_cr = "ifnull(payment_gl_entry.credit_in_account_currency, 0) - ifnull(payment_gl_entry.debit_in_account_currency, 0)"
+		dr_or_cr = "debit_in_account_currency - credit_in_account_currency"
+		payment_dr_or_cr = "payment_gl_entry.credit_in_account_currency - payment_gl_entry.debit_in_account_currency"
 	else:
-		dr_or_cr = "ifnull(credit_in_account_currency, 0) - ifnull(debit_in_account_currency, 0)"
-		payment_dr_or_cr = "ifnull(payment_gl_entry.debit_in_account_currency, 0) - ifnull(payment_gl_entry.credit_in_account_currency, 0)"
+		dr_or_cr = "credit_in_account_currency - debit_in_account_currency"
+		payment_dr_or_cr = "payment_gl_entry.debit_in_account_currency - payment_gl_entry.credit_in_account_currency"

 	invoice_list = frappe.db.sql("""select
 			voucher_no,	voucher_type, posting_date,
 			ifnull(sum({dr_or_cr}), 0) as invoice_amount,
 			(
 				select
-					ifnull(sum(ifnull({payment_dr_or_cr}, 0)), 0)
+					ifnull(sum({payment_dr_or_cr}), 0)
 				from `tabGL Entry` payment_gl_entry
 				where
 					payment_gl_entry.against_voucher_type = invoice_gl_entry.voucher_type
--- a/erpnext/buying/doctype/purchase_common/purchase_common.js
+++ b/erpnext/buying/doctype/purchase_common/purchase_common.js
@@ -157,6 +157,10 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
 	},
 	add_deduct_tax: function(doc, cdt, cdn) {
 		this.calculate_taxes_and_totals();
+	},
+	
+	get_items_from_product_bundle: function() {
+		erpnext.buying.get_items_from_product_bundle(this.frm)
 	}
 });

@@ -180,3 +184,78 @@ erpnext.buying.get_default_bom = function(frm) {
 		}
 	});
 }
+
+erpnext.buying.get_items_from_product_bundle = function(frm) {
+	var dialog = new frappe.ui.Dialog({
+		title: __("Get Items from Product Bundle"),
+		fields: [
+			{
+				"fieldtype": "Link", 
+				"label": __("Product Bundle"), 
+				"fieldname": "product_bundle", 
+				"options":"Product Bundle",
+				"reqd": 1 
+			},
+			{
+				"fieldtype": "Currency", 
+				"label": __("Quantity"), 
+				"fieldname": "quantity", 
+				"reqd": 1,
+				"default": 1
+			},
+			{
+				"fieldtype": "Button", 
+				"label": __("Get Items"), 
+				"fieldname": "get_items", 
+				"cssClass": "btn-primary"
+			}
+		]
+	});
+
+	dialog.fields_dict.get_items.$input.click(function() {
+		args = dialog.get_values();
+		if(!args) return;
+		dialog.hide();
+		return frappe.call({
+			type: "GET",
+			method: "erpnext.stock.doctype.packed_item.packed_item.get_items_from_product_bundle",
+			args: {
+				args: {
+					item_code: args.product_bundle,
+					quantity: args.quantity,
+					parenttype: frm.doc.doctype,
+					parent: frm.doc.name,
+					supplier: frm.doc.supplier,
+					currency: frm.doc.currency,
+					conversion_rate: frm.doc.conversion_rate,
+					price_list: frm.doc.buying_price_list,
+					price_list_currency: frm.doc.price_list_currency,
+					plc_conversion_rate: frm.doc.plc_conversion_rate,
+					company: frm.doc.company,
+					is_subcontracted: frm.doc.is_subcontracted,
+					transaction_date: frm.doc.transaction_date || frm.doc.posting_date,
+					ignore_pricing_rule: frm.doc.ignore_pricing_rule
+				}
+			},
+			freeze: true,
+			callback: function(r) {
+				if(!r.exc && r.message) {
+					for ( var i=0; i< r.message.length; i++ ) {
+						var d = frm.add_child("items");
+						var item = r.message[i];
+						for ( var key in  item) {
+							if ( !is_null(item[key]) ) {
+								d[key] = item[key];
+							}
+						}
+						if(frappe.meta.get_docfield(d.doctype, "price_list_rate", d.name)) {
+							frm.script_manager.trigger("price_list_rate", d.doctype, d.name);
+						}
+					}
+					frm.refresh_field("items");
+				}
+			}
+		})
+	});
+	dialog.show();
+}
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -18,9 +18,27 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
 		var me = this;
 		this._super();
 		// this.frm.dashboard.reset();
+		var allow_receipt = false;
+		var is_drop_ship = false;

+		for (var i in cur_frm.doc.items) {
+			var item = cur_frm.doc.items[i];
+			if(item.delivered_by_supplier !== 1) {
+				allow_receipt = true;
+			}
+			
+			else {
+				is_drop_ship = true
+			}
+			
+			if(is_drop_ship && allow_receipt) {
+				break;
+			}
+		}
+		
+		cur_frm.set_df_property("drop_ship", "hidden", !is_drop_ship);
+		
 		if(doc.docstatus == 1 && !in_list(["Stopped", "Closed", "Delivered"], doc.status)) {
-
 			if (this.frm.has_perm("submit")) {
 				if(flt(doc.per_billed, 2) < 100 || doc.per_received < 100) {
 					cur_frm.add_custom_button(__('Stop'), this.stop_purchase_order);
@@ -29,7 +47,7 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
 				cur_frm.add_custom_button(__('Close'), this.close_purchase_order);
 			}

-			if(doc.delivered_by_supplier && doc.status!="Delivered"){
+			if(is_drop_ship && doc.status!="Delivered"){
 				cur_frm.add_custom_button(__('Mark as Delivered'), this.delivered_by_supplier);
 			}

@@ -37,7 +55,12 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
 				cur_frm.add_custom_button(__('Payment'), cur_frm.cscript.make_bank_entry);
 			}

-			if(flt(doc.per_received, 2) < 100 && this.frm.doc.__onload.has_stock_item) {
+		} else if(doc.docstatus===0) {
+			cur_frm.cscript.add_from_mappers();
+		} 
+		
+		if(doc.docstatus == 1 && !in_list(["Stopped", "Closed"], doc.status)) {
+			if(flt(doc.per_received, 2) < 100 && this.frm.doc.__onload.has_stock_item && allow_receipt) {
 				cur_frm.add_custom_button(__('Receive'), this.make_purchase_receipt).addClass("btn-primary");

 				if(doc.is_subcontracted==="Yes") {
@@ -47,13 +70,9 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
 			}

 			if(flt(doc.per_billed, 2) < 100)
-				cur_frm.add_custom_button(__('Invoice'), this.make_purchase_invoice);
-
-
-		} else if(doc.docstatus===0) {
-			cur_frm.cscript.add_from_mappers();
+				cur_frm.add_custom_button(__('Invoice'), this.make_purchase_invoice);	
 		}
-
+		
 		if(doc.docstatus == 1 && in_list(["Stopped", "Closed", "Delivered"], doc.status)) {
 			if (this.frm.has_perm("submit")) {
 				cur_frm.add_custom_button(__('Re-open'), this.unstop_purchase_order);
@@ -169,15 +188,19 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
 			}
 		});
 	},
+	
 	stop_purchase_order: function(){
 		cur_frm.cscript.update_status('Stop', 'Stopped')
 	},
+	
 	unstop_purchase_order: function(){
 		cur_frm.cscript.update_status('Re-open', 'Submitted')
 	},
+	
 	close_purchase_order: function(){
 		cur_frm.cscript.update_status('Close', 'Closed')
 	},
+	
 	delivered_by_supplier: function(){
 		cur_frm.cscript.update_status('Deliver', 'Delivered')
 	}
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -20,6 +20,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "icon-user", 
   "permlevel": 0, 
@@ -43,6 +44,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Title", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "precision": "", 
@@ -65,6 +67,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Series", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "naming_series", 
   "oldfieldtype": "Select", 
@@ -90,6 +93,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Supplier", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "supplier", 
   "oldfieldtype": "Link", 
@@ -115,6 +119,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Supply Raw Materials", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "No\nYes", 
   "permlevel": 0, 
@@ -137,6 +142,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Supplier Name", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -159,6 +165,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Address", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -180,6 +187,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Contact", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -201,6 +209,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Mobile No", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -222,6 +231,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Contact Email", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -242,6 +252,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
@@ -266,6 +277,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Date", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "transaction_date", 
   "oldfieldtype": "Date", 
@@ -289,6 +301,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Amended From", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "amended_from", 
   "oldfieldtype": "Data", 
@@ -314,6 +327,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Company", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "company", 
   "oldfieldtype": "Link", 
@@ -330,8 +344,8 @@
  {
   "allow_on_submit": 0, 
   "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "delivered_by_supplier", 
+   "collapsible": 0, 
+   "collapsible_depends_on": "", 
   "fieldname": "drop_ship", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -339,6 +353,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Drop Ship", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -354,7 +369,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
-   "depends_on": "delivered_by_supplier", 
+   "depends_on": "", 
   "fieldname": "customer", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -362,6 +377,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Customer", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Customer", 
   "permlevel": 0, 
@@ -378,7 +394,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
-   "depends_on": "delivered_by_supplier", 
+   "depends_on": "", 
   "fieldname": "customer_name", 
   "fieldtype": "Data", 
   "hidden": 0, 
@@ -386,6 +402,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Customer Name", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -408,6 +425,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "To be delivered to customer", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -429,6 +447,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -444,7 +463,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
-   "depends_on": "delivered_by_supplier", 
+   "depends_on": "", 
   "fieldname": "customer_address", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -452,6 +471,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Customer Address", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Address", 
   "permlevel": 0, 
@@ -468,7 +488,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
-   "depends_on": "delivered_by_supplier", 
+   "depends_on": "", 
   "fieldname": "customer_contact_person", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -476,6 +496,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Customer Contact", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Contact", 
   "permlevel": 0, 
@@ -499,6 +520,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Customer Address Display", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -521,6 +543,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Customer Contact", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -543,6 +566,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Customer Mobile No", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -565,6 +589,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Customer Contact Email", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -587,6 +612,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Currency and Price List", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "icon-tag", 
   "permlevel": 0, 
@@ -609,6 +635,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Currency", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "currency", 
   "oldfieldtype": "Select", 
@@ -634,6 +661,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Exchange Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "conversion_rate", 
   "oldfieldtype": "Currency", 
@@ -657,6 +685,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -678,6 +707,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Price List", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Price List", 
   "permlevel": 0, 
@@ -700,6 +730,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Price List Currency", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Currency", 
   "permlevel": 0, 
@@ -722,6 +753,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Price List Exchange Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "9", 
@@ -744,6 +776,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Ignore Pricing Rule", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 1, 
   "print_hide": 1, 
@@ -765,6 +798,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-shopping-cart", 
@@ -788,6 +822,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Items", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "po_details", 
   "oldfieldtype": "Table", 
@@ -812,6 +847,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Get Last Purchase Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Button", 
   "permlevel": 0, 
@@ -823,6 +859,29 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "get_items_from_product_bundle", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Get Items from Product Bundle", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
  {
   "allow_on_submit": 0, 
   "bold": 0, 
@@ -833,6 +892,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -854,6 +914,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -877,6 +938,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Net Total (Company Currency)", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "net_total", 
   "oldfieldtype": "Currency", 
@@ -900,6 +962,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -921,6 +984,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "currency", 
   "permlevel": 0, 
@@ -944,6 +1008,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Net Total", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "net_total_import", 
   "oldfieldtype": "Currency", 
@@ -968,6 +1033,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-money", 
@@ -992,6 +1058,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Taxes and Charges", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "purchase_other_charges", 
   "oldfieldtype": "Link", 
@@ -1016,6 +1083,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Purchase Taxes and Charges", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "purchase_tax_details", 
   "oldfieldtype": "Table", 
@@ -1040,6 +1108,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Taxes and Charges Calculation", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldtype": "HTML", 
   "permlevel": 0, 
@@ -1062,6 +1131,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-money", 
@@ -1085,6 +1155,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Taxes and Charges Added (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "other_charges_added", 
   "oldfieldtype": "Currency", 
@@ -1109,6 +1180,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Taxes and Charges Deducted (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "other_charges_deducted", 
   "oldfieldtype": "Currency", 
@@ -1133,6 +1205,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total Taxes and Charges (Company Currency)", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "total_tax", 
   "oldfieldtype": "Currency", 
@@ -1156,6 +1229,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -1178,6 +1252,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Taxes and Charges Added", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "other_charges_added_import", 
   "oldfieldtype": "Currency", 
@@ -1202,6 +1277,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Taxes and Charges Deducted", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "other_charges_deducted_import", 
   "oldfieldtype": "Currency", 
@@ -1226,6 +1302,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total Taxes and Charges", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "currency", 
   "permlevel": 0, 
@@ -1250,6 +1327,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Additional Discount", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -1273,6 +1351,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Apply Additional Discount On", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "\nGrand Total\nNet Total", 
   "permlevel": 0, 
@@ -1295,6 +1374,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -1317,6 +1397,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Additional Discount Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "currency", 
   "permlevel": 0, 
@@ -1340,6 +1421,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Additional Discount Amount (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -1362,6 +1444,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -1384,6 +1467,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Grand Total (Company Currency)", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "grand_total", 
   "oldfieldtype": "Currency", 
@@ -1409,6 +1493,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "In Words (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "in_words", 
   "oldfieldtype": "Data", 
@@ -1432,6 +1517,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Rounded Total (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "rounded_total", 
   "oldfieldtype": "Currency", 
@@ -1456,6 +1542,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Advance Paid", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -1476,6 +1563,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
@@ -1498,6 +1586,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Grand Total", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "grand_total_import", 
   "oldfieldtype": "Currency", 
@@ -1522,6 +1611,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "In Words", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "in_words_import", 
   "oldfieldtype": "Data", 
@@ -1546,6 +1636,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Terms and Conditions", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-legal", 
@@ -1569,6 +1660,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Terms", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "tc_name", 
   "oldfieldtype": "Link", 
@@ -1593,6 +1685,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Terms and Conditions", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "terms", 
   "oldfieldtype": "Text Editor", 
@@ -1617,6 +1710,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Contact Details", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "icon-bullhorn", 
   "permlevel": 0, 
@@ -1639,6 +1733,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Supplier Address", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Address", 
   "permlevel": 0, 
@@ -1660,6 +1755,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -1681,6 +1777,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Contact Person", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Contact", 
   "permlevel": 0, 
@@ -1703,6 +1800,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "More Information", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "permlevel": 0, 
@@ -1726,6 +1824,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Status", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "status", 
   "oldfieldtype": "Select", 
@@ -1750,6 +1849,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Fiscal Year", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "fiscal_year", 
   "oldfieldtype": "Select", 
@@ -1774,6 +1874,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Ref SQ", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "ref_sq", 
   "oldfieldtype": "Data", 
@@ -1796,6 +1897,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -1820,6 +1922,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "% Received", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "per_received", 
   "oldfieldtype": "Currency", 
@@ -1845,6 +1948,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "% Billed", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "per_billed", 
   "oldfieldtype": "Currency", 
@@ -1868,6 +1972,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Printing Settings", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
@@ -1892,6 +1997,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Letter Head", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "letter_head", 
   "oldfieldtype": "Select", 
@@ -1916,6 +2022,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Print Heading", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "select_print_heading", 
   "oldfieldtype": "Link", 
@@ -1942,6 +2049,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Raw Materials Supplied", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-truck", 
@@ -1965,6 +2073,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Supplied Items", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "po_raw_material_details", 
   "oldfieldtype": "Table", 
@@ -1990,6 +2099,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Recurring", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "icon-time", 
   "permlevel": 0, 
@@ -2012,6 +2122,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -2035,6 +2146,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Is Recurring", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -2057,6 +2169,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Recurring Type", 
+   "length": 0, 
   "no_copy": 1, 
   "options": "Monthly\nQuarterly\nHalf-yearly\nYearly", 
   "permlevel": 0, 
@@ -2081,6 +2194,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "From Date", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -2104,6 +2218,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "To Date", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -2127,6 +2242,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Repeat on Day of Month", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -2150,6 +2266,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "End Date", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -2171,6 +2288,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -2194,6 +2312,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Next Date", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -2216,6 +2335,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Recurring Id", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -2239,6 +2359,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Notification Email Address", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -2261,6 +2382,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Recurring Print Format", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Print Format", 
   "permlevel": 0, 
@@ -2283,7 +2405,8 @@
 "is_submittable": 1, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2015-11-04 04:44:22.025827", 
+ "max_attachments": 0, 
+ "modified": "2015-11-20 15:51:09.314885", 
 "modified_by": "Administrator", 
 "module": "Buying", 
 "name": "Purchase Order", 
--- a/erpnext/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py
@@ -51,6 +51,7 @@ class PurchaseOrder(BuyingController):
 		self.validate_for_subcontracting()
 		self.validate_minimum_order_qty()
 		self.create_raw_materials_supplied("supplied_items")
+		self.set_received_qty_and_billed_amount_for_drop_ship_items()

 	def validate_with_previous_doc(self):
 		super(PurchaseOrder, self).validate_with_previous_doc({
@@ -137,9 +138,11 @@ class PurchaseOrder(BuyingController):
 		"""update requested qty (before ordered_qty is updated)"""
 		item_wh_list = []
 		for d in self.get("items"):
-			if (not po_item_rows or d.name in po_item_rows) and [d.item_code, d.warehouse] not in item_wh_list \
-					and frappe.db.get_value("Item", d.item_code, "is_stock_item") and d.warehouse:
-				item_wh_list.append([d.item_code, d.warehouse])
+			if (not po_item_rows or d.name in po_item_rows) \
+				and [d.item_code, d.warehouse] not in item_wh_list \
+				and frappe.db.get_value("Item", d.item_code, "is_stock_item") \
+				and d.warehouse and not d.delivered_by_supplier:
+					item_wh_list.append([d.item_code, d.warehouse])

 		for item_code, warehouse in item_wh_list:
 			update_bin_qty(item_code, warehouse, {
@@ -164,13 +167,13 @@ class PurchaseOrder(BuyingController):
 		clear_doctype_notifications(self)

 	def on_submit(self):
-		if self.delivered_by_supplier == 1:
+		if self.has_drop_ship_item():
 			self.update_status_updater()

 		super(PurchaseOrder, self).on_submit()

 		purchase_controller = frappe.get_doc("Purchase Common")
-
+		
 		self.update_prevdoc_status()
 		self.update_requested_qty()
 		self.update_ordered_qty()
@@ -181,7 +184,7 @@ class PurchaseOrder(BuyingController):
 		purchase_controller.update_last_purchase_rate(self, is_submit = 1)

 	def on_cancel(self):
-		if self.delivered_by_supplier == 1:
+		if self.has_drop_ship_item():
 			self.update_status_updater()

 		pc_obj = frappe.get_doc('Purchase Common')
@@ -234,7 +237,7 @@ class PurchaseOrder(BuyingController):
 		"""Update delivered qty in Sales Order for drop ship"""
 		sales_orders_to_update = []
 		for item in self.items:
-			if item.prevdoc_doctype == "Sales Order":
+			if item.prevdoc_doctype == "Sales Order" and item.delivered_by_supplier == 1:	
 				if item.prevdoc_docname not in sales_orders_to_update:
 					sales_orders_to_update.append(item.prevdoc_docname)

@@ -244,6 +247,21 @@ class PurchaseOrder(BuyingController):
 			so.set_status(update=True)
 			so.notify_update()

+	def has_drop_ship_item(self):
+		is_drop_ship = False
+		
+		for item in self.items:
+			if item.delivered_by_supplier == 1:
+				is_drop_ship = True
+		
+		return is_drop_ship
+	
+	def set_received_qty_and_billed_amount_for_drop_ship_items(self):
+		for item in self.items:
+			if item.delivered_by_supplier == 1:
+				item.received_qty = item.qty
+				item.billed_amt = item.amount
+
@frappe.whitelist()
 def stop_or_unstop_purchase_orders(names, status):
 	if not frappe.has_permission("Purchase Order", "write"):
@@ -262,7 +280,6 @@ def stop_or_unstop_purchase_orders(names, status):

 	frappe.local.message_log = []

-
 def set_missing_values(source, target):
 	target.ignore_pricing_rule = 1
 	target.run_method("set_missing_values")
@@ -292,7 +309,7 @@ def make_purchase_receipt(source_name, target_doc=None):
 				"parenttype": "prevdoc_doctype",
 			},
 			"postprocess": update_item,
-			"condition": lambda doc: doc.received_qty < doc.qty
+			"condition": lambda doc: doc.received_qty < doc.qty and doc.delivered_by_supplier!=1
 		},
 		"Purchase Taxes and Charges": {
 			"doctype": "Purchase Taxes and Charges",
@@ -328,7 +345,7 @@ def make_purchase_invoice(source_name, target_doc=None):
 				"parent": "purchase_order",
 			},
 			"postprocess": update_item,
-			"condition": lambda doc: doc.base_amount==0 or doc.billed_amt < doc.amount
+			"condition": lambda doc: (doc.base_amount==0 or doc.billed_amt < doc.amount) and doc.delivered_by_supplier!=1
 		},
 		"Purchase Taxes and Charges": {
 			"doctype": "Purchase Taxes and Charges",
--- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
+++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
--- a/erpnext/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.json
+++ b/erpnext/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.json
@@ -18,6 +18,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Item Code", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "main_item_code", 
   "oldfieldtype": "Data", 
@@ -41,6 +42,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Raw Material Item Code", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "rm_item_code", 
   "oldfieldtype": "Data", 
@@ -64,6 +66,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Supplied Qty", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "required_qty", 
   "oldfieldtype": "Currency", 
@@ -87,6 +90,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "rate", 
   "oldfieldtype": "Currency", 
@@ -111,6 +115,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "amount", 
   "oldfieldtype": "Currency", 
@@ -135,6 +140,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "BOM Detail No", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "bom_detail_no", 
   "oldfieldtype": "Data", 
@@ -158,6 +164,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Reference Name", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "reference_name", 
   "oldfieldtype": "Data", 
@@ -181,6 +188,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Conversion Factor", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "conversion_factor", 
   "oldfieldtype": "Currency", 
@@ -204,6 +212,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Stock Uom", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "stock_uom", 
   "oldfieldtype": "Data", 
@@ -226,7 +235,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 1, 
- "modified": "2015-10-02 07:39:05.021801", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:54.025077", 
 "modified_by": "Administrator", 
 "module": "Buying", 
 "name": "Purchase Order Item Supplied", 
--- a/erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json
+++ b/erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json
@@ -18,6 +18,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Item Code", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "main_item_code", 
   "oldfieldtype": "Data", 
@@ -41,6 +42,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Raw Material Item Code", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "rm_item_code", 
   "oldfieldtype": "Data", 
@@ -64,6 +66,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Description", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "description", 
   "oldfieldtype": "Data", 
@@ -89,6 +92,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Batch No", 
+   "length": 0, 
   "no_copy": 1, 
   "options": "Batch", 
   "permlevel": 0, 
@@ -111,6 +115,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Serial No", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -131,6 +136,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -152,6 +158,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Required Qty", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "required_qty", 
   "oldfieldtype": "Currency", 
@@ -175,6 +182,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Consumed Qty", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "consumed_qty", 
   "oldfieldtype": "Currency", 
@@ -198,6 +206,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Stock Uom", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "stock_uom", 
   "oldfieldtype": "Data", 
@@ -222,6 +231,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "rate", 
   "oldfieldtype": "Currency", 
@@ -246,6 +256,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "amount", 
   "oldfieldtype": "Currency", 
@@ -270,6 +281,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Conversion Factor", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "conversion_factor", 
   "oldfieldtype": "Currency", 
@@ -293,6 +305,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Current Stock", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "current_stock", 
   "oldfieldtype": "Currency", 
@@ -316,6 +329,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Reference Name", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "reference_name", 
   "oldfieldtype": "Data", 
@@ -339,6 +353,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "BOM Detail No", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "bom_detail_no", 
   "oldfieldtype": "Data", 
@@ -360,7 +375,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 1, 
- "modified": "2015-10-02 07:39:06.224300", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:54.573531", 
 "modified_by": "Administrator", 
 "module": "Buying", 
 "name": "Purchase Receipt Item Supplied", 
--- a/erpnext/buying/doctype/quality_inspection/quality_inspection.json
+++ b/erpnext/buying/doctype/quality_inspection/quality_inspection.json
@@ -18,7 +18,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Series",  
+   "label": "Series", 
+   "length": 0, 
   "no_copy": 1, 
   "options": "QI-", 
   "permlevel": 0, 
@@ -42,6 +43,7 @@
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Report Date", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "report_date", 
   "oldfieldtype": "Date", 
@@ -64,6 +66,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -85,7 +88,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 1, 
   "in_list_view": 1, 
-   "label": "Inspection Type",  
+   "label": "Inspection Type", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "inspection_type", 
   "oldfieldtype": "Select", 
@@ -110,6 +114,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Purchase Receipt No", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "purchase_receipt_no", 
   "oldfieldtype": "Link", 
@@ -134,6 +139,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Delivery Note No", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "delivery_note_no", 
   "oldfieldtype": "Link", 
@@ -157,6 +163,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -179,6 +186,7 @@
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Item Code", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "item_code", 
   "oldfieldtype": "Link", 
@@ -203,6 +211,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Item Serial No", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "item_serial_no", 
   "oldfieldtype": "Link", 
@@ -227,6 +236,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Batch No", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "batch_no", 
   "oldfieldtype": "Link", 
@@ -251,6 +261,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Sample Size", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "sample_size", 
   "oldfieldtype": "Currency", 
@@ -273,6 +284,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
@@ -296,6 +308,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Item Name", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -318,6 +331,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Description", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "description", 
   "oldfieldtype": "Small Text", 
@@ -341,6 +355,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -364,6 +379,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Inspected By", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "inspected_by", 
   "oldfieldtype": "Data", 
@@ -388,6 +404,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Verified By", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "verified_by", 
   "oldfieldtype": "Data", 
@@ -410,6 +427,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -432,6 +450,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Remarks", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "remarks", 
   "oldfieldtype": "Text", 
@@ -455,6 +474,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Amended From", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "amended_from", 
   "oldfieldtype": "Data", 
@@ -479,6 +499,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "Simple", 
@@ -502,6 +523,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Get Specification Details", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "get_item_specification_details", 
   "permlevel": 0, 
@@ -524,6 +546,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Readings", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "qa_specification_details", 
   "oldfieldtype": "Table", 
@@ -547,7 +570,8 @@
 "is_submittable": 1, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2015-10-02 07:39:06.674821", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:54.786379", 
 "modified_by": "Administrator", 
 "module": "Buying", 
 "name": "Quality Inspection", 
--- a/erpnext/buying/doctype/quality_inspection_reading/quality_inspection_reading.json
+++ b/erpnext/buying/doctype/quality_inspection_reading/quality_inspection_reading.json
@@ -19,6 +19,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Parameter", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "specification", 
   "oldfieldtype": "Data", 
@@ -42,6 +43,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Acceptance Criteria", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "value", 
   "oldfieldtype": "Data", 
@@ -65,6 +67,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Reading 1", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "reading_1", 
   "oldfieldtype": "Data", 
@@ -88,6 +91,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Reading 2", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "reading_2", 
   "oldfieldtype": "Data", 
@@ -111,6 +115,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Reading 3", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "reading_3", 
   "oldfieldtype": "Data", 
@@ -134,6 +139,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Reading 4", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "reading_4", 
   "oldfieldtype": "Data", 
@@ -157,6 +163,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Reading 5", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "reading_5", 
   "oldfieldtype": "Data", 
@@ -180,6 +187,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Reading 6", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "reading_6", 
   "oldfieldtype": "Data", 
@@ -203,6 +211,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Reading 7", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "reading_7", 
   "oldfieldtype": "Data", 
@@ -226,6 +235,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Reading 8", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "reading_8", 
   "oldfieldtype": "Data", 
@@ -249,6 +259,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Reading 9", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "reading_9", 
   "oldfieldtype": "Data", 
@@ -272,6 +283,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Reading 10", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "reading_10", 
   "oldfieldtype": "Data", 
@@ -295,7 +307,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Status",  
+   "label": "Status", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "status", 
   "oldfieldtype": "Select", 
@@ -318,7 +331,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 1, 
- "modified": "2015-10-02 07:39:06.876419", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:54.873250", 
 "modified_by": "Administrator", 
 "module": "Buying", 
 "name": "Quality Inspection Reading", 
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -21,6 +21,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-user", 
@@ -43,7 +44,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Series",  
+   "label": "Series", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "naming_series", 
   "oldfieldtype": "Select", 
@@ -68,6 +70,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Supplier Name", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "supplier_name", 
   "oldfieldtype": "Data", 
@@ -90,6 +93,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -112,6 +116,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Supplier Type", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "supplier_type", 
   "oldfieldtype": "Link", 
@@ -136,6 +141,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Is Frozen", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -157,6 +163,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -179,6 +186,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Billing Currency", 
+   "length": 0, 
   "no_copy": 1, 
   "options": "Currency", 
   "permlevel": 0, 
@@ -201,6 +209,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Price List", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Price List", 
   "permlevel": 0, 
@@ -222,6 +231,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -244,6 +254,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Taxes and Charges", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Purchase Taxes and Charges Template", 
   "permlevel": 0, 
@@ -266,6 +277,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Credit Days", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -288,6 +300,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Address and Contacts", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Column Break", 
   "options": "icon-map-marker", 
@@ -311,6 +324,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Address HTML", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -331,6 +345,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -353,6 +368,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Contact HTML", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -375,6 +391,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Default Payable Accounts", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -398,6 +415,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Accounts", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Party Account", 
   "permlevel": 0, 
@@ -421,6 +439,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Supplier Details", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -443,6 +462,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Website", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "website", 
   "oldfieldtype": "Data", 
@@ -467,6 +487,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Supplier Details", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "supplier_details", 
   "oldfieldtype": "Code", 
@@ -490,6 +511,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Communications", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Communication", 
   "permlevel": 0, 
@@ -511,7 +533,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2015-10-02 07:39:14.767820", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:58.500467", 
 "modified_by": "Administrator", 
 "module": "Buying", 
 "name": "Supplier", 
--- a/erpnext/buying/doctype/supplier/supplier.py
+++ b/erpnext/buying/doctype/supplier/supplier.py
@@ -93,7 +93,7 @@ def get_dashboard_info(supplier):
 			{"supplier": supplier, "docstatus": ["!=", 2] }, "count(*)")

 	billing_this_year = frappe.db.sql("""
-		select sum(ifnull(credit_in_account_currency, 0)) - sum(ifnull(debit_in_account_currency, 0))
+		select sum(credit_in_account_currency) - sum(debit_in_account_currency)
 		from `tabGL Entry`
 		where voucher_type='Purchase Invoice' and party_type = 'Supplier'
 			and party=%s and fiscal_year = %s""",
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -20,6 +20,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "icon-user", 
   "permlevel": 0, 
@@ -43,6 +44,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Title", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "precision": "", 
@@ -64,7 +66,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Series",  
+   "label": "Series", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "naming_series", 
   "oldfieldtype": "Select", 
@@ -90,6 +93,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Supplier", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "supplier", 
   "oldfieldtype": "Link", 
@@ -114,6 +118,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Name", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -135,6 +140,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Address", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -156,6 +162,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Contact", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -177,6 +184,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Mobile No", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -198,6 +206,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Contact Email", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -218,6 +227,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
@@ -242,6 +252,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Date", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "transaction_date", 
   "oldfieldtype": "Date", 
@@ -265,6 +276,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Amended From", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "amended_from", 
   "oldfieldtype": "Data", 
@@ -290,6 +302,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Company", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "company", 
   "oldfieldtype": "Link", 
@@ -314,6 +327,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Currency and Price List", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "icon-tag", 
   "permlevel": 0, 
@@ -336,6 +350,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Currency", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "currency", 
   "oldfieldtype": "Select", 
@@ -361,6 +376,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Exchange Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "conversion_rate", 
   "oldfieldtype": "Currency", 
@@ -384,6 +400,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -407,6 +424,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Price List", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Price List", 
   "permlevel": 0, 
@@ -430,6 +448,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Price List Currency", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Currency", 
   "permlevel": 0, 
@@ -453,6 +472,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Price List Exchange Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "9", 
@@ -475,6 +495,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Ignore Pricing Rule", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 1, 
   "print_hide": 1, 
@@ -496,6 +517,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-shopping-cart", 
@@ -519,6 +541,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Items", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "po_details", 
   "oldfieldtype": "Table", 
@@ -532,6 +555,29 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "get_items_from_product_bundle", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Get Items from Product Bundle", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
  {
   "allow_on_submit": 0, 
   "bold": 0, 
@@ -542,6 +588,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -563,6 +610,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -586,6 +634,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Net Total (Company Currency)", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "net_total", 
   "oldfieldtype": "Currency", 
@@ -609,6 +658,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -630,6 +680,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "currency", 
   "permlevel": 0, 
@@ -653,6 +704,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Net Total", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "net_total_import", 
   "oldfieldtype": "Currency", 
@@ -677,6 +729,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Taxes and Charges", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-money", 
@@ -701,6 +754,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Taxes and Charges", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "purchase_other_charges", 
   "oldfieldtype": "Link", 
@@ -725,6 +779,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Purchase Taxes and Charges", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "purchase_tax_details", 
   "oldfieldtype": "Table", 
@@ -749,6 +804,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Taxes and Charges Calculation", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldtype": "HTML", 
   "permlevel": 0, 
@@ -771,6 +827,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-money", 
@@ -794,6 +851,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Taxes and Charges Added (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "other_charges_added", 
   "oldfieldtype": "Currency", 
@@ -818,6 +876,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Taxes and Charges Deducted (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "other_charges_deducted", 
   "oldfieldtype": "Currency", 
@@ -842,6 +901,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total Taxes and Charges (Company Currency)", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "total_tax", 
   "oldfieldtype": "Currency", 
@@ -865,6 +925,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -887,6 +948,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Taxes and Charges Added", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "other_charges_added_import", 
   "oldfieldtype": "Currency", 
@@ -911,6 +973,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Taxes and Charges Deducted", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "other_charges_deducted_import", 
   "oldfieldtype": "Currency", 
@@ -935,6 +998,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total Taxes and Charges", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "currency", 
   "permlevel": 0, 
@@ -959,6 +1023,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Additional Discount", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -981,7 +1046,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Apply Additional Discount On",  
+   "label": "Apply Additional Discount On", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "\nGrand Total\nNet Total", 
   "permlevel": 0, 
@@ -1004,6 +1070,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -1026,6 +1093,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Additional Discount Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "currency", 
   "permlevel": 0, 
@@ -1049,6 +1117,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Additional Discount Amount (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -1071,6 +1140,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -1093,6 +1163,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Grand Total (Company Currency)", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "grand_total", 
   "oldfieldtype": "Currency", 
@@ -1118,6 +1189,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "In Words (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "in_words", 
   "oldfieldtype": "Data", 
@@ -1141,6 +1213,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Rounded Total (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "rounded_total", 
   "oldfieldtype": "Currency", 
@@ -1164,6 +1237,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
@@ -1186,6 +1260,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Grand Total", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "grand_total_import", 
   "oldfieldtype": "Currency", 
@@ -1210,6 +1285,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "In Words", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "in_words_import", 
   "oldfieldtype": "Data", 
@@ -1234,6 +1310,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Terms and Conditions", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-legal", 
@@ -1257,6 +1334,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Terms", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "tc_name", 
   "oldfieldtype": "Link", 
@@ -1281,6 +1359,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Terms and Conditions", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "terms", 
   "oldfieldtype": "Text Editor", 
@@ -1305,6 +1384,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Contact Details", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "icon-bullhorn", 
   "permlevel": 0, 
@@ -1327,6 +1407,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Supplier Address", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Address", 
   "permlevel": 0, 
@@ -1349,6 +1430,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Contact Person", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Contact", 
   "permlevel": 0, 
@@ -1371,6 +1453,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Printing Settings", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -1393,6 +1476,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Print Heading", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "select_print_heading", 
   "oldfieldtype": "Link", 
@@ -1417,6 +1501,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Letter Head", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "letter_head", 
   "oldfieldtype": "Select", 
@@ -1441,6 +1526,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "More Information", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-file-text", 
@@ -1463,7 +1549,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 1, 
   "in_list_view": 0, 
-   "label": "Status",  
+   "label": "Status", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "status", 
   "oldfieldtype": "Select", 
@@ -1488,7 +1575,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Is Subcontracted",  
+   "label": "Is Subcontracted", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "\nYes\nNo", 
   "permlevel": 0, 
@@ -1510,6 +1598,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -1531,6 +1620,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Fiscal Year", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "fiscal_year", 
   "oldfieldtype": "Select", 
@@ -1554,7 +1644,8 @@
 "is_submittable": 1, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2015-10-02 07:39:15.027459", 
+ "max_attachments": 0, 
+ "modified": "2015-11-23 10:28:06.637629", 
 "modified_by": "Administrator", 
 "module": "Buying", 
 "name": "Supplier Quotation", 
--- a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
+++ b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
@@ -19,6 +19,7 @@
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Item Code", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "item_code", 
   "oldfieldtype": "Link", 
@@ -44,6 +45,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Supplier Part Number", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
@@ -64,6 +66,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -86,6 +89,7 @@
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Item Name", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "item_name", 
   "oldfieldtype": "Data", 
@@ -109,6 +113,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Description", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -131,6 +136,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Description", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "description", 
   "oldfieldtype": "Small Text", 
@@ -155,6 +161,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -176,6 +183,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Image", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -198,6 +206,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Image View", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "image", 
   "permlevel": 0, 
@@ -221,6 +230,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Quantity and Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -242,6 +252,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Quantity", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "qty", 
   "oldfieldtype": "Currency", 
@@ -267,6 +278,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Price List Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "currency", 
   "permlevel": 0, 
@@ -290,6 +302,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Discount on Price List Rate (%)", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -310,6 +323,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -331,6 +345,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "UOM", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "uom", 
   "oldfieldtype": "Link", 
@@ -357,6 +372,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Price List Rate (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -378,6 +394,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -399,6 +416,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Rate ", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "import_rate", 
   "oldfieldtype": "Currency", 
@@ -423,6 +441,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "import_amount", 
   "oldfieldtype": "Currency", 
@@ -446,6 +465,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -467,6 +487,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Rate (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "purchase_rate", 
   "oldfieldtype": "Currency", 
@@ -493,6 +514,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Amount (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "amount", 
   "oldfieldtype": "Currency", 
@@ -517,6 +539,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Pricing Rule", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Pricing Rule", 
   "permlevel": 0, 
@@ -538,6 +561,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -560,6 +584,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Net Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -582,6 +607,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Net Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "currency", 
   "permlevel": 0, 
@@ -604,6 +630,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -626,6 +653,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Net Rate (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -649,6 +677,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Net Amount (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
@@ -672,6 +701,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Warehouse and Reference", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -693,6 +723,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Warehouse", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "warehouse", 
   "oldfieldtype": "Link", 
@@ -717,6 +748,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Project Name", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Project", 
   "permlevel": 0, 
@@ -739,6 +771,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Prevdoc DocType", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "prevdoc_doctype", 
   "oldfieldtype": "Data", 
@@ -762,6 +795,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Material Request No", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "prevdoc_docname", 
   "oldfieldtype": "Link", 
@@ -787,6 +821,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -808,6 +843,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Material Request Detail No", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "prevdoc_detail_docname", 
   "oldfieldtype": "Data", 
@@ -831,6 +867,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Brand", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "brand", 
   "oldfieldtype": "Link", 
@@ -856,6 +893,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Item Group", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "item_group", 
   "oldfieldtype": "Link", 
@@ -881,6 +919,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Item Tax Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "item_tax_rate", 
   "oldfieldtype": "Small Text", 
@@ -904,6 +943,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Page Break", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "page_break", 
   "oldfieldtype": "Check", 
@@ -925,7 +965,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 1, 
- "modified": "2015-10-19 03:04:51.597343", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:58.833849", 
 "modified_by": "Administrator", 
 "module": "Buying", 
 "name": "Supplier Quotation Item", 
--- a/erpnext/change_log/v6/v6_11_0.md
+++ b/erpnext/change_log/v6/v6_11_0.md
@@ -0,0 +1 @@
+- Get Items from Product Bundle in Purchase Documents
--- a/erpnext/change_log/v6/v6_11_1.md
+++ b/erpnext/change_log/v6/v6_11_1.md
@@ -0,0 +1 @@
+- Update Clearance date via Upload and Download like Stock Reconciliation. Sponsored by [AG Techologies, Singapore](http://agtech.com.sg)
--- a/erpnext/config/docs.py
+++ b/erpnext/config/docs.py
@@ -2,22 +2,18 @@ source_link = "https://github.com/frappe/erpnext"
 docs_base_url = "https://frappe.github.io/erpnext"
 headline = "Learn ERPNext Inside Out"
 sub_heading = "Find detailed explanation for all ERPNext features"
-long_description = """
-ERPNext helps you to manage all your business information in one application and use it to manage operations and take decisions based on data.
+long_description = """ERPNext is a fully featured ERP system designed for Small and Medium Sized
+business. ERPNext covers a wide range of features including Accounting, CRM,
+Inventory management, Selling, Purchasing, Manufacturing, Projects, HR &
+Payroll, Website, E-Commerce and much more.

-Among other things, ERPNext will help you to:
+ERPNext is based on the Frappe Framework is highly customizable and extendable.
+You can create Custom Form, Fields, Scripts and can also create your own Apps
+to extend ERPNext functionality.

- Track all Invoices and Payments.
- Know what quantity of which product is available in stock.
- Identify open customer queries.
- Manage payroll.
- Assign tasks and follow up on them.
- Maintain a database of all your customers, suppliers and their contacts.
- Prepare quotes.
- Get reminders on maintenance schedules.
- Publish your website.
-
-And a lot lot lot more."""
+ERPNext is Open Source under the GNU General Public Licence v3 and has been
+listed as one of the Best Open Source Softwares in the world by my online
+blogs."""

 def get_context(context):
 	context.top_bar_items = [
--- a/erpnext/config/stock.py
+++ b/erpnext/config/stock.py
@@ -77,11 +77,6 @@ def get_data():
 					"type": "doctype",
 					"name": "Landed Cost Voucher",
 					"description": _("Update additional costs to calculate landed cost of items"),
-				},
-				{
-					"type": "doctype",
-					"name": "Stock UOM Replace Utility",
-					"description": _("Change UOM for an Item."),
 				}
 			]
 		},
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -152,13 +152,14 @@ class AccountsController(TransactionBase):
 					ret = get_item_details(args)

 					for fieldname, value in ret.items():
-						if item.meta.get_field(fieldname) and \
-							(item.get(fieldname) is None or fieldname in force_item_fields) \
-								and value is not None:
+						if item.meta.get_field(fieldname) and value is not None:
+							if (item.get(fieldname) is None or fieldname in force_item_fields):
 								item.set(fieldname, value)

-						if fieldname == "cost_center" and item.meta.get_field("cost_center") \
-							and not item.get("cost_center") and value is not None:
+							elif fieldname == "cost_center" and not item.get("cost_center"):
+								item.set(fieldname, value)
+
+							elif fieldname == "conversion_factor" and not item.get("conversion_factor"):
 								item.set(fieldname, value)

 					if ret.get("pricing_rule"):
@@ -257,7 +258,7 @@ class AccountsController(TransactionBase):
 		self.set(parentfield, self.get(parentfield, {"allocated_amount": ["not in", [0, None, ""]]}))

 		frappe.db.sql("""delete from `tab%s` where parentfield=%s and parent = %s
-			and ifnull(allocated_amount, 0) = 0""" % (childtype, '%s', '%s'), (parentfield, self.name))
+			and allocated_amount = 0""" % (childtype, '%s', '%s'), (parentfield, self.name))

 	def get_advances(self, account_head, party_type, party, child_doctype, parentfield, dr_or_cr, against_order_field):
 		"""Returns list of advances against Account, Party, Reference"""
@@ -375,7 +376,7 @@ class AccountsController(TransactionBase):

 		advance_paid = frappe.db.sql("""
 			select
-				sum(ifnull({dr_or_cr}, 0))
+				sum({dr_or_cr})
 			from
 				`tabJournal Entry Account`
 			where
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -52,15 +52,6 @@ class BuyingController(StockController):
 					self.supplier = supplier
 					break

-	def validate_warehouse(self):
-		from erpnext.stock.utils import validate_warehouse_company
-
-		warehouses = list(set([d.warehouse for d in
-			self.get("items") if getattr(d, "warehouse", None)]))
-
-		for w in warehouses:
-			validate_warehouse_company(w, self.company)
-
 	def validate_stock_or_nonstock_items(self):
 		if self.meta.get_field("taxes") and not self.get_stock_items():
 			tax_for_valuation = [d.account_head for d in self.get("taxes")
@@ -234,7 +225,7 @@ class BuyingController(StockController):

 	def get_items_from_bom(self, item_code, bom):
 		bom_items = frappe.db.sql("""select t2.item_code,
-			ifnull(t2.qty, 0) / ifnull(t1.quantity, 1) as qty_consumed_per_unit,
+			t2.qty / ifnull(t1.quantity, 1) as qty_consumed_per_unit,
 			t2.rate, t2.stock_uom, t2.name, t2.description
 			from `tabBOM` t1, `tabBOM Item` t2, tabItem t3
 			where t2.parent = t1.name and t1.item = %s
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -165,7 +165,7 @@ def item_query(doctype, txt, searchfield, start, page_len, filters):
 			concat(substr(tabItem.description, 1, 40), "..."), description) as decription
 		from tabItem
 		where tabItem.docstatus < 2
-			and ifnull(tabItem.has_variants, 0)=0
+			and tabItem.has_variants=0
 			and tabItem.disabled=0
 			and (tabItem.end_of_life > %(today)s or ifnull(tabItem.end_of_life, '0000-00-00')='0000-00-00')
 			and (tabItem.`{key}` LIKE %(txt)s
--- a/erpnext/controllers/recurring_document.py
+++ b/erpnext/controllers/recurring_document.py
@@ -37,7 +37,7 @@ def manage_recurring_documents(doctype, next_date=None, commit=True):
 	condition = " and ifnull(status, '') != 'Stopped'" if doctype in ("Sales Order", "Purchase Order") else ""

 	recurring_documents = frappe.db.sql("""select name, recurring_id
-		from `tab{0}` where ifnull(is_recurring, 0)=1
+		from `tab{0}` where is_recurring=1
 		and docstatus=1 and next_date=%s
 		and next_date <= ifnull(end_date, '2199-12-31') {1}""".format(doctype, condition), next_date)

--- a/erpnext/controllers/sales_and_purchase_return.py
+++ b/erpnext/controllers/sales_and_purchase_return.py
@@ -110,7 +110,7 @@ def get_already_returned_items(doc):
 			`tab{0} Item` child, `tab{1}` par
 		where
 			child.parent = par.name and par.docstatus = 1
-			and ifnull(par.is_return, 0) = 1 and par.return_against = %s and child.qty < 0
+			and par.is_return = 1 and par.return_against = %s and child.qty < 0
 		group by item_code
 	""".format(doc.doctype, doc.doctype), doc.return_against))

--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -202,7 +202,7 @@ class SellingController(StockController):
 			
 		delivered_via_si = frappe.db.sql("""select sum(si_item.qty) 
 			from `tabSales Invoice Item` si_item, `tabSales Invoice` si
-			where si_item.parent = si.name and ifnull(si.update_stock, 0) = 1
+			where si_item.parent = si.name and si.update_stock = 1
 			and si_item.so_detail = %s and si.docstatus = 1 
 			and si_item.sales_order = %s
 			and si.name != %s""", (so_detail, so, current_docname))
--- a/erpnext/controllers/status_updater.py
+++ b/erpnext/controllers/status_updater.py
@@ -177,6 +177,7 @@ class StatusUpdater(Document):
 			else:
 				args['cond'] = ' and parent!="%s"' % self.name.replace('"', '\"')

+			args['set_modified'] = ''
 			if change_modified:
 				args['set_modified'] = ', modified = now(), modified_by = "{0}"'\
 					.format(frappe.db.escape(frappe.session.user))
@@ -210,7 +211,7 @@ class StatusUpdater(Document):
 				if not args.get("extra_cond"): args["extra_cond"] = ""

 				frappe.db.sql("""update `tab%(target_dt)s`
-					set %(target_field)s = (select sum(%(source_field)s)
+					set %(target_field)s = (select ifnull(sum(%(source_field)s), 0)
 						from `tab%(source_dt)s` where `%(join_field)s`="%(detail_id)s"
 						and (docstatus=1 %(cond)s) %(extra_cond)s) %(second_source_condition)s
 					where name='%(detail_id)s'""" % args)
@@ -228,16 +229,18 @@ class StatusUpdater(Document):
 			# update percent complete in the parent table
 			if args.get('target_parent_field'):
 				frappe.db.sql("""update `tab%(target_parent_dt)s`
-					set %(target_parent_field)s = round((select sum(if(%(target_ref_field)s >
-						ifnull(%(target_field)s, 0), %(target_field)s,
-						%(target_ref_field)s))/sum(%(target_ref_field)s)*100
-						from `tab%(target_dt)s` where parent="%(name)s"), 2) %(set_modified)s
+					set %(target_parent_field)s = round(
+						ifnull((select
+							ifnull(sum(if(%(target_ref_field)s > %(target_field)s, %(target_field)s, %(target_ref_field)s)), 0)
+							/ sum(%(target_ref_field)s) * 100
+						from `tab%(target_dt)s` where parent="%(name)s"), 0), 2)
+						%(set_modified)s
 					where name='%(name)s'""" % args)

 			# update field
 			if args.get('status_field'):
 				frappe.db.sql("""update `tab%(target_parent_dt)s`
-					set %(status_field)s = if(ifnull(%(target_parent_field)s,0)<0.001,
+					set %(status_field)s = if(%(target_parent_field)s<0.001,
 						'Not %(keyword)s', if(%(target_parent_field)s>=99.99,
 						'Fully %(keyword)s', 'Partly %(keyword)s'))
 					where name='%(name)s'""" % args)
@@ -264,10 +267,10 @@ class StatusUpdater(Document):

 	def update_billing_status(self, zero_amount_refdoc, ref_dt, ref_fieldname):
 		for ref_dn in zero_amount_refdoc:
-			ref_doc_qty = flt(frappe.db.sql("""select sum(ifnull(qty, 0)) from `tab%s Item`
+			ref_doc_qty = flt(frappe.db.sql("""select ifnull(sum(qty), 0) from `tab%s Item`
 				where parent=%s""" % (ref_dt, '%s'), (ref_dn))[0][0])

-			billed_qty = flt(frappe.db.sql("""select sum(ifnull(qty, 0))
+			billed_qty = flt(frappe.db.sql("""select ifnull(sum(qty), 0)
 				from `tab%s Item` where %s=%s and docstatus=1""" %
 				(self.doctype, ref_fieldname, '%s'), (ref_dn))[0][0])

--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -221,7 +221,7 @@ class StockController(AccountsController):
 	def get_incoming_rate_for_sales_return(self, item_code, warehouse, against_document):
 		incoming_rate = 0.0
 		if against_document and item_code:
-			incoming_rate = frappe.db.sql("""select abs(ifnull(stock_value_difference, 0) / actual_qty)
+			incoming_rate = frappe.db.sql("""select abs(stock_value_difference / actual_qty)
 				from `tabStock Ledger Entry`
 				where voucher_type = %s and voucher_no = %s
 					and item_code = %s and warehouse=%s limit 1""",
@@ -303,6 +303,15 @@ class StockController(AccountsController):
 						}))

 		self.make_sl_entries(sl_entries)
+		
+	def validate_warehouse(self):
+		from erpnext.stock.utils import validate_warehouse_company
+
+		warehouses = list(set([d.warehouse for d in
+			self.get("items") if getattr(d, "warehouse", None)]))
+
+		for w in warehouses:
+			validate_warehouse_company(w, self.company)

 def update_gl_entries_after(posting_date, posting_time, for_warehouses=None, for_items=None,
 		warehouse_account=None):
@@ -376,6 +385,6 @@ def get_warehouse_account():
 	warehouse_account = frappe._dict()

 	for d in frappe.db.sql("""select warehouse, name, account_currency from tabAccount
-		where account_type = 'Warehouse' and ifnull(warehouse, '') != ''""", as_dict=1):
+		where account_type = 'Warehouse' and (warehouse is not null and warehouse != '')""", as_dict=1):
 			warehouse_account.setdefault(d.warehouse, d)
 	return warehouse_account
--- a/erpnext/controllers/website_list_for_contact.py
+++ b/erpnext/controllers/website_list_for_contact.py
@@ -13,7 +13,7 @@ def get_list_context(context=None):
 		"global_number_format": frappe.db.get_default("number_format") or "#,###.##",
 		"currency": frappe.db.get_default("currency"),
 		"currency_symbols": json.dumps(dict(frappe.db.sql("""select name, symbol
-			from tabCurrency where ifnull(enabled,0)=1"""))),
+			from tabCurrency where enabled=1"""))),
 		"row_template": "templates/includes/transaction_row.html",
 		"get_list": get_transaction_list
 	}
--- a/erpnext/crm/doctype/lead/lead.json
+++ b/erpnext/crm/doctype/lead/lead.json
@@ -20,6 +20,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "icon-user", 
   "permlevel": 0, 
@@ -41,7 +42,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Series",  
+   "label": "Series", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "naming_series", 
   "oldfieldtype": "Select", 
@@ -66,6 +68,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Person Name", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "lead_name", 
   "oldfieldtype": "Data", 
@@ -89,6 +92,7 @@
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Organization Name", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "company_name", 
   "oldfieldtype": "Data", 
@@ -112,6 +116,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Email Id", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "email_id", 
   "oldfieldtype": "Data", 
@@ -135,6 +140,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -157,7 +163,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 1, 
   "in_list_view": 1, 
-   "label": "Status",  
+   "label": "Status", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "status", 
   "oldfieldtype": "Select", 
@@ -181,7 +188,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 1, 
   "in_list_view": 0, 
-   "label": "Source",  
+   "label": "Source", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "source", 
   "oldfieldtype": "Select", 
@@ -207,6 +215,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "From Customer", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "customer", 
   "oldfieldtype": "Link", 
@@ -233,6 +242,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Campaign Name", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "campaign_name", 
   "oldfieldtype": "Link", 
@@ -256,6 +266,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -279,6 +290,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Lead Owner", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "lead_owner", 
   "oldfieldtype": "Link", 
@@ -302,6 +314,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -324,6 +337,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Next Contact By", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "contact_by", 
   "oldfieldtype": "Link", 
@@ -350,6 +364,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Next Contact Date", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "contact_date", 
   "oldfieldtype": "Date", 
@@ -374,6 +389,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Address & Contact", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Column Break", 
   "options": "icon-map-marker", 
@@ -398,6 +414,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Address Desc", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "<em>Addresses will appear only when you save the lead</em>", 
   "permlevel": 0, 
@@ -420,6 +437,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Address HTML", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -440,6 +458,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -461,6 +480,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Phone", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "contact_no", 
   "oldfieldtype": "Data", 
@@ -484,6 +504,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Mobile No.", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "mobile_no", 
   "oldfieldtype": "Data", 
@@ -507,6 +528,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Fax", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "fax", 
   "oldfieldtype": "Data", 
@@ -530,6 +552,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Website", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "website", 
   "oldfieldtype": "Data", 
@@ -554,6 +577,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Territory", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "territory", 
   "oldfieldtype": "Link", 
@@ -578,6 +602,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "More Information", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-file-text", 
@@ -600,7 +625,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 1, 
   "in_list_view": 0, 
-   "label": "Lead Type",  
+   "label": "Lead Type", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "type", 
   "oldfieldtype": "Select", 
@@ -624,7 +650,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 1, 
   "in_list_view": 0, 
-   "label": "Market Segment",  
+   "label": "Market Segment", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "market_segment", 
   "oldfieldtype": "Select", 
@@ -649,6 +676,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Industry", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "industry", 
   "oldfieldtype": "Link", 
@@ -672,7 +700,8 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Request Type",  
+   "label": "Request Type", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "request_type", 
   "oldfieldtype": "Select", 
@@ -697,6 +726,7 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Fiscal Year", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "fiscal_year", 
   "oldfieldtype": "Select", 
@@ -720,6 +750,7 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
@@ -743,6 +774,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Company", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "company", 
   "oldfieldtype": "Link", 
@@ -767,6 +799,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Unsubscribed", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -788,6 +821,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Blog Subscriber", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -808,7 +842,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2015-10-02 07:38:55.014441", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:49.250337", 
 "modified_by": "Administrator", 
 "module": "CRM", 
 "name": "Lead", 
--- a/erpnext/crm/doctype/newsletter/newsletter.json
+++ b/erpnext/crm/doctype/newsletter/newsletter.json
@@ -21,6 +21,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Newsletter List", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Newsletter List", 
   "permlevel": 0, 
@@ -44,6 +45,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Subject", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -66,6 +68,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Sender", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -87,6 +90,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Email Sent?", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -108,6 +112,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -129,6 +134,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Message", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -151,6 +157,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -173,6 +180,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Test Email Id", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
@@ -194,6 +202,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Test", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "test_send", 
   "permlevel": 0, 
@@ -215,7 +224,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2015-10-02 07:38:57.733269", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:50.506090", 
 "modified_by": "Administrator", 
 "module": "CRM", 
 "name": "Newsletter", 
--- a/erpnext/crm/doctype/newsletter_list/newsletter_list.json
+++ b/erpnext/crm/doctype/newsletter_list/newsletter_list.json
@@ -20,6 +20,7 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Title", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "precision": "", 
@@ -43,6 +44,7 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Total Subscribers", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
@@ -62,7 +64,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2015-10-02 07:38:57.839265", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:50.643141", 
 "modified_by": "Administrator", 
 "module": "CRM", 
 "name": "Newsletter List", 
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Anand Doshi	7781763efa	Merge branch 'develop'	2015-11-27 17:24:49 +05:30
Anand Doshi	711e675987	bumped to version 6.11.2	2015-11-27 17:54:49 +06:00
Anand Doshi	5b03a75970	[hotfix] total amount in journal entry	2015-11-27 17:24:06 +05:30
Anand Doshi	f4c3819134	Merge branch 'develop'	2015-11-27 15:08:57 +05:30
Anand Doshi	b8591da62c	bumped to version 6.11.1	2015-11-27 15:38:57 +06:00
Anand Doshi	a5f0a7ce06	[change-log]	2015-11-27 15:08:36 +05:30
Rushabh Mehta	9785cd35dc	[minor] quote optional in email digest	2015-11-27 14:50:15 +05:30
Anand Doshi	e38a53443a	Merge pull request #4386 from rmehta/bank-reco-bulk-edit [enhancement] bulk edit in bank reconciliation, #4356	2015-11-27 14:46:58 +05:30
Anand Doshi	70f57eb7f0	[fix] call apply price list, apply pricing rule only if price list is mentioned or there are items in the table	2015-11-27 14:38:01 +05:30
Rushabh Mehta	2d70887aaf	[enhancement] bulk edit in bank reconciliation, #4356	2015-11-27 11:37:18 +05:30
Anand Doshi	15b22c9d7d	Merge pull request #4383 from anandpdoshi/fix/auto-material-request-template [fix] Show Item Name in re-order email. Fixes #4381	2015-11-27 11:31:36 +05:30
Anand Doshi	4b12740e8d	[fix] Shipment in portal. Fixes #4291	2015-11-26 18:22:03 +05:30
Anand Doshi	f942d97a18	[fix] removed UOM Replace Utility from message	2015-11-26 16:08:09 +05:30
Anand Doshi	5cf7a0bf72	[fix] Show Item Name in re-order email. Fixes #4381	2015-11-26 15:11:18 +05:30
Anand Doshi	49abb18928	Merge branch 'develop'	2015-11-26 12:42:07 +05:30
Anand Doshi	7c016d2ee2	bumped to version 6.11.0	2015-11-26 13:12:06 +06:00
Anand Doshi	666fbaff8c	[translations]	2015-11-26 12:40:13 +05:30
Anand Doshi	6674d1dc2b	[change-log]	2015-11-26 12:37:52 +05:30
Anand Doshi	5225a9752b	Merge pull request #4377 from rmehta/jv-print-fix [fix] total amount in journal entry	2015-11-26 11:05:35 +05:30
Rushabh Mehta	0fd67b23f4	[minor] duplicate button on BOM cancel	2015-11-26 10:37:24 +05:30
Rushabh Mehta	b82bdd6f1f	[fix] total amount in journal entry	2015-11-26 09:08:07 +05:30
Rushabh Mehta	131bec67bc	Merge pull request #4373 from anandpdoshi/fix/status-updater-after-not-null [fix] status update - update qty after int float not null change	2015-11-25 18:09:13 +05:30
Anand Doshi	ebae726237	[fix] status update - update qty after int float not null change	2015-11-25 17:55:47 +05:30
Anand Doshi	3314f1cba7	Merge pull request #4374 from rmehta/reorder-fix [minor] re-order at re-order level, not below	2015-11-25 17:54:36 +05:30
Anand Doshi	a4870118ea	Merge pull request #4365 from anandpdoshi/fix/print-hide-if-0 [fix] Show Credit/Debit as blank in Journal Entry Account if its value is 0	2015-11-25 17:28:54 +05:30
Rushabh Mehta	03b3d66b90	[minor] re-order at re-order level, not below	2015-11-25 17:23:00 +05:30
Anand Doshi	5c968abcef	[fix] Show Credit/Debit as blank in Journal Entry Account if its value is 0	2015-11-25 16:33:00 +05:30
Anand Doshi	699d9be4b7	Merge pull request #4369 from bohlian/develop Removed Warehouse Requirement for SerialNo Listing	2015-11-25 15:19:47 +05:30
Anand Doshi	ad5cf9b22e	Merge pull request #4370 from rmehta/manual-contribs [manual] contributions via Robert Becht	2015-11-25 15:18:56 +05:30
Anand Doshi	cdb63fd52a	Merge pull request #4366 from anandpdoshi/fix/setup-wizard-fiscal-year [fix] validate fiscal year dates and company name	2015-11-25 15:18:28 +05:30
Rushabh Mehta	bf07cba6a8	[manual] contributions via Robert Becht	2015-11-25 14:42:02 +05:30
bohlian	ff1ab26088	Removed Warehouse Requirement for SerialNo Listing Removed the requirement that Warehouse has to be assigned for Serial Number to appear in the listing.	2015-11-25 16:06:20 +08:00
Anand Doshi	5c3469a01e	[fix] validate fiscal year dates and company name	2015-11-24 17:06:54 +05:30
Anand Doshi	625592e997	Merge pull request #4363 from anandpdoshi/fix/web-form-customization [fix] Changed Country fieldtype to Link in Web Form	2015-11-24 13:26:23 +05:30
Anand Doshi	7221805587	[fix] Changed Country fieldtype to Link in Web Form	2015-11-23 19:20:51 +05:30
Anand Doshi	a0961bc0cf	Merge pull request #4360 from nabinhait/bom_fix [fix] Update exploded materials table from 'Update Cost' button	2015-11-23 16:55:31 +05:30
Nabin Hait	cf3cf2ca1f	[fix] Update exploded materials table from 'Update Cost' button	2015-11-23 15:12:18 +05:30
Anand Doshi	17e9b9444d	Merge pull request #4355 from nabinhait/items_from_product_bundle Get Items from Product Bundle button in purchase cycle	2015-11-23 12:59:41 +05:30
Nabin Hait	c4f4c09e42	Get Items from Product Bundle button in purchase cycle	2015-11-23 12:51:37 +05:30
Anand Doshi	fe1e5884b8	Merge pull request #4354 from nabinhait/pcv [fix] Period closing account should be of type Liability / Equity	2015-11-23 12:35:06 +05:30
Nabin Hait	072c540ae3	[fix] Period closing account should be of type Liability / Equity	2015-11-23 09:52:08 +05:30
Anand Doshi	3012f0d39a	Merge branch 'develop'	2015-11-20 18:10:04 +05:30
Anand Doshi	c6d91b8fb2	bumped to version 6.10.2	2015-11-20 18:40:04 +06:00
Anand Doshi	019111b05c	[translations]	2015-11-20 18:00:11 +05:30
Anand Doshi	ddad05dab3	[fix] Customer de-duplication sql	2015-11-20 17:29:40 +05:30
Nabin Hait	9e425863a1	Merge pull request #4342 from revant/patch-2 fix frappe call to update_purchase_receipt_status	2015-11-20 12:47:35 +05:30
Revant Nandgaonkar	bde324a90f	fix frappe call to update_purchase_receipt_status changed update_purchase_order_status to update_purchase_receipt_status	2015-11-20 12:41:58 +05:30
Anand Doshi	b133240298	Merge branch 'develop'	2015-11-20 00:42:15 +05:30
Anand Doshi	56c605f36e	bumped to version 6.10.1	2015-11-20 01:12:15 +06:00
Anand Doshi	8c56adf42b	[hotfix] drop ship patch	2015-11-20 00:41:28 +05:30
Nabin Hait	690023538e	Merge branch 'develop'	2015-11-19 14:34:29 +05:30
Nabin Hait	19ce11aa9c	bumped to version 6.10.0	2015-11-19 15:04:29 +06:00
Nabin Hait	f649013079	Merge pull request #4329 from anandpdoshi/int-float-not-null [enhancement] Int, Currency, Float, Percent as not null and default to 0	2015-11-19 14:30:58 +05:30
Anand Doshi	120ea62acc	[fix] get_balance_on: convert date to string	2015-11-19 14:24:39 +05:30
Anand Doshi	602e8253be	[enhancement] Int, Currency, Float, Percent as not null and default to 0	2015-11-19 13:23:36 +05:30
Nabin Hait	06df19b56a	Reload PO Item before patch	2015-11-19 12:46:37 +05:30
Nabin Hait	0f72750fc8	Merge pull request #4338 from anandpdoshi/fix/salary-slip-earning-deduction [fix] pull earning and deduction on change of employee	2015-11-19 12:06:37 +05:30
Nabin Hait	5f0b93ed71	Merge pull request #4337 from nabinhait/payment_tool_fix [fix] Mapping from Payment Tool	2015-11-19 12:05:38 +05:30
Nabin Hait	5284b22c53	[fix] Mapping from negative outstanding invoice	2015-11-19 11:42:23 +05:30
Nabin Hait	343c1a5cbd	[fix] Mapping from Payment Tool	2015-11-19 11:42:22 +05:30
Nabin Hait	6daa5746f8	Merge pull request #4335 from saurabh6790/drop-ship-fixes-1 Move Drop Ship from Purchase Order to Purchase Order Items	2015-11-19 11:40:06 +05:30
Anand Doshi	7763bb5c15	[fix] pull earning and deduction on change of employee	2015-11-18 19:04:03 +05:30
Saurabh	b65c69f9eb	[fixes] drop ship test case fixes	2015-11-18 17:39:26 +05:30
Saurabh	2e292060c5	[fix] Reserved and ordered qty fix for drop ship orders	2015-11-18 17:39:26 +05:30
Saurabh	a4bf02de6c	[fixes] overlapping allocation	2015-11-18 17:39:26 +05:30
Saurabh	3bcf82c7a6	[fixes] test leave allocation record creation	2015-11-18 17:39:26 +05:30
Saurabh	55222a5b82	[fixes] test case fixes	2015-11-18 17:39:26 +05:30
Saurabh	2c85efe31a	[fixes] hide drop ship section and typo	2015-11-18 17:39:26 +05:30
Saurabh	20628f5bd8	[patch] mo drop shipment from purchase order to purchase order item	2015-11-18 17:39:25 +05:30
Saurabh	caf122f015	[fixes] dropship fixes	2015-11-18 17:39:25 +05:30
Nabin Hait	b73f3da02c	Merge pull request #4332 from nabinhait/pi_fix [fix] Check Purchase Receipt mandatory only for stock items	2015-11-18 17:30:29 +05:30
Nabin Hait	f0607b45c5	Merge pull request #4334 from revant/patch-1 Mode of Payment validate	2015-11-18 17:29:54 +05:30
Nabin Hait	b45ca3ada0	Merge pull request #4331 from nabinhait/pcv_fix [fix] Allowed Equity accounts in closing account in Period Closing Voucher	2015-11-18 17:15:57 +05:30
Nabin Hait	11e8728715	Merge pull request #4336 from nabinhait/offer_letter_print_format [fix] Don't add pagebreak in print format if terms contains only spaces and newlines	2015-11-18 17:15:34 +05:30
Rushabh Mehta	edc8ab03b5	[minor] fixed description	2015-11-18 16:48:19 +05:30
Revant Nandgaonkar	27c266b081	improve mode_of_payment validate_accounts using frappe.db.get_value instead of frappe.get_list	2015-11-18 13:28:09 +05:30
Nabin Hait	c7fc11a812	[fix] Don't add pagebreak in print format if terms contains only spaces and newlines	2015-11-18 12:59:00 +05:30
Rushabh Mehta	d962d1c96f	[minor] remove feedback line from digest	2015-11-18 10:53:03 +05:30
Revant Nandgaonkar	11f8a0033a	Mode of Payment validate Error when Same Company is entered multiple times in accounts Error when Company of Ledger account doesn't match with Company Selected	2015-11-17 21:15:00 +05:30
Anand Doshi	da79740cdf	[fix] injection	2015-11-17 18:27:50 +05:30
Nabin Hait	2cf1699937	[fix] Check Purchase Receipt mandatory only for stock items	2015-11-17 17:32:07 +05:30
Nabin Hait	1a3413875f	[fix] Allowed Equity accounts in closing account in Period Closing Voucher	2015-11-17 17:12:44 +05:30
Anand Doshi	3667da1053	[fix] Set user_id as Reply-To in birthday reminder emails	2015-11-16 19:31:20 +05:30
				`@@ -0,0 +1 @@`
				`- Get Items from Product Bundle in Purchase Documents`
				`@@ -0,0 +1 @@`
				`- Update Clearance date via Upload and Download like Stock Reconciliation. Sponsored by [AG Techologies, Singapore](http://agtech.com.sg)`