Merge branch 'develop'

bumped to version 6.14.0
[videos] added missing videos
2026-06-23 19:19:40 +00:00 · 2015-12-21 18:34:08 +05:30 · 2015-12-21 19:04:08 +06:00 · 2015-12-21 18:32:23 +05:30 · 2015-12-21 18:16:26 +05:30 · 2015-12-21 18:06:15 +05:30
2179 changed files with 184477 additions and 60912 deletions
--- a/erpnext/version.py
+++ b/erpnext/version.py
@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.7.5'
+__version__ = '6.14.0'
--- a/erpnext/accounts/doctype/account/account.json
+++ b/erpnext/accounts/doctype/account/account.json
@@ -20,10 +20,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -41,9 +43,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, 
@@ -63,11 +67,13 @@
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Account Name", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "account_name", 
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -87,10 +93,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Is Group", 
+   "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, 
@@ -109,12 +117,14 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Company", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "company", 
   "oldfieldtype": "Link", 
   "options": "Company", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -132,11 +142,13 @@
   "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, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -154,11 +166,13 @@
   "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, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -178,11 +192,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Currency", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Currency", 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -200,9 +216,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, 
@@ -222,12 +240,14 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Parent Account", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "parent_account", 
   "oldfieldtype": "Link", 
   "options": "Account", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -246,13 +266,15 @@
   "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", 
-   "options": "\nBank\nCash\nTax\nChargeable\nWarehouse\nReceivable\nPayable\nEquity\nFixed Asset\nCost of Goods Sold\nExpense Account\nRound Off\nIncome Account\nStock Received But Not Billed\nExpenses Included In Valuation\nStock Adjustment\nStock\nTemporary", 
+   "options": "\nBank\nCash\nDepreciation\nTax\nChargeable\nWarehouse\nReceivable\nPayable\nEquity\nFixed Asset\nCost of Goods Sold\nExpense Account\nRound Off\nIncome Account\nStock Received But Not Billed\nExpenses Included In Valuation\nStock Adjustment\nStock\nTemporary", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -272,11 +294,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "tax_rate", 
   "oldfieldtype": "Currency", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -295,13 +319,15 @@
   "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", 
   "options": "No\nYes", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -320,10 +346,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Warehouse", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Warehouse", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -341,11 +369,13 @@
   "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, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -364,9 +394,11 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Lft", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -385,9 +417,11 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Rgt", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -406,9 +440,11 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Old Parent", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -426,7 +462,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2015-10-02 07:38:37.436071", 
+ "max_attachments": 0, 
+ "modified": "2015-12-12 10:19:54.365839", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Account", 
--- a/erpnext/accounts/doctype/account/account.py
+++ b/erpnext/accounts/doctype/account/account.py
@@ -65,12 +65,19 @@ class Account(Document):
 				if self.root_type != db_value.root_type:
 					frappe.db.sql("update `tabAccount` set root_type=%s where lft > %s and rgt < %s",
 						(self.root_type, self.lft, self.rgt))
+						
+		if self.root_type and not self.report_type:
+			self.report_type = "Balance Sheet" \
+				if self.root_type in ("Asset", "Liability", "Equity") else "Profit and Loss"

 	def validate_root_details(self):
 		# does not exists parent
 		if frappe.db.exists("Account", self.name):
 			if not frappe.db.get_value("Account", self.name, "parent_account"):
 				throw(_("Root cannot be edited."), RootNotEditable)
+				
+		if not self.parent_account and not self.is_group:
+			frappe.throw(_("Root Account must be a group"))

 	def validate_frozen_accounts_modifier(self):
 		old_value = frappe.db.get_value("Account", self.name, "freeze_account")
@@ -127,11 +134,11 @@ class Account(Document):
 			and docstatus != 2""", self.name)

 	def validate_mandatory(self):
-		if not self.report_type:
-			throw(_("Report Type is mandatory"))
-
 		if not self.root_type:
 			throw(_("Root Type is mandatory"))
+			
+		if not self.report_type:
+			throw(_("Report Type is mandatory"))

 	def validate_warehouse_account(self):
 		if not cint(frappe.defaults.get_global_default("auto_accounting_for_stock")):
@@ -192,6 +199,10 @@ class Account(Document):

 			if val != [self.is_group, self.root_type, self.company]:
 				throw(_("""Merging is only possible if following properties are same in both records. Is Group, Root Type, Company"""))
+				
+			if self.is_group and frappe.db.get_value("Account", new, "parent_account") == old:
+				frappe.db.set_value("Account", new, "parent_account", 
+					frappe.db.get_value("Account", old, "parent_account"))

 		return new_account

--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/gt_cuentas_plantilla.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/gt_cuentas_plantilla.json
@@ -11,7 +11,10 @@
          "IVA por Cobrar": {},
          "Retenciones de IVA recibidas": {}
        },
-        "Inventario": {}
+        "Inventario": {
+          "is_group": 1,
+          "account_type": "Stock"
+        }
      },
      "No Corriente": {
        "Activos Fijos": {},
--- 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", "account_currency", "account_currency");
+	},
+
+	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.json
+++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json
@@ -19,10 +19,12 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Bank Account", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Account", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -34,17 +36,19 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
-   "fieldname": "company", 
+   "fieldname": "account_currency", 
   "fieldtype": "Link", 
   "hidden": 1, 
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Company", 
+   "in_list_view": 0, 
+   "label": "Account Currency", 
+   "length": 0, 
   "no_copy": 0, 
-   "options": "Company", 
+   "options": "Currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -63,9 +67,11 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "From Date", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -84,9 +90,11 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "To Date", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -105,9 +113,11 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Include Reconciled Entries", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -126,10 +136,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Get Relevant Entries", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -148,10 +160,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Journal Entries", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Bank Reconciliation Detail", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -170,10 +184,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Update Clearance Date", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -192,10 +208,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total Amount", 
+   "length": 0, 
   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
+   "options": "account_currency", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -213,7 +231,9 @@
 "is_submittable": 0, 
 "issingle": 1, 
 "istable": 0, 
- "modified": "2015-02-05 05:11:34.776660", 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2015-11-30 12:44:45.105451", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Bank Reconciliation", 
@@ -241,5 +261,6 @@
  }
 ], 
 "read_only": 1, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "version": 0
 }
--- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
+++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
@@ -15,12 +15,11 @@ 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,
-				t2.credit, t1.posting_date, t2.against_account, t1.clearance_date,
-				t2.reference_type, t2.reference_name
+		dl = frappe.db.sql("""select t1.name, t1.cheque_no, t1.cheque_date, t2.debit_in_account_currency,
+				t2.credit_in_account_currency, t1.posting_date, t2.against_account, t1.clearance_date
 			from
 				`tabJournal Entry` t1, `tabJournal Entry Account` t2
 			where
@@ -39,11 +38,11 @@ class BankReconciliation(Document):
 			nl.voucher_id = d.name
 			nl.cheque_number = d.cheque_no
 			nl.cheque_date = d.cheque_date
-			nl.debit = d.debit
-			nl.credit = d.credit
+			nl.debit = d.debit_in_account_currency
+			nl.credit = d.credit_in_account_currency
 			nl.against_account = d.against_account
 			nl.clearance_date = d.clearance_date
-			self.total_amount += flt(d.debit) - flt(d.credit)
+			self.total_amount += flt(d.debit_in_account_currency) - flt(d.credit_in_account_currency)

 	def update_details(self):
 		vouchers = []
--- a/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json
+++ b/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json
@@ -18,35 +18,14 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Voucher ID", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "voucher_id", 
   "oldfieldtype": "Link", 
   "options": "Journal Entry", 
   "permlevel": 0, 
   "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, 
-   "collapsible": 0, 
-   "fieldname": "clearance_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Clearance Date", 
-   "no_copy": 0, 
-   "oldfieldname": "clearance_date", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
-   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -65,34 +44,13 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Against Account", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "against_account", 
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "cheque_number", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Cheque Number", 
-   "no_copy": 0, 
-   "oldfieldname": "cheque_number", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -111,12 +69,14 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Debit", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "debit", 
   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
+   "options": "account_currency", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -135,12 +95,14 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Credit", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "credit", 
   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
+   "options": "account_currency", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -152,47 +114,25 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
-   "fieldname": "reference_type", 
-   "fieldtype": "Link", 
+   "fieldname": "column_break_5", 
+   "fieldtype": "Column Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Reference Type", 
+   "length": 0, 
   "no_copy": 0, 
-   "options": "DocType", 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
-   "read_only": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "reference_name", 
-   "fieldtype": "Dynamic Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Reference Name", 
-   "no_copy": 0, 
-   "options": "reference_type", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "unique": 0, 
+   "width": "50%"
  }, 
  {
   "allow_on_submit": 0, 
@@ -205,11 +145,38 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Posting Date", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "posting_date", 
   "oldfieldtype": "Date", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "cheque_number", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Cheque Number", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "cheque_number", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -226,19 +193,69 @@
   "hidden": 0, 
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
   "label": "Cheque Date", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "cheque_date", 
   "oldfieldtype": "Date", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "clearance_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Clearance Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "clearance_date", 
+   "oldfieldtype": "Date", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "data_10", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
  }
 ], 
 "hide_heading": 0, 
@@ -249,12 +266,15 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 1, 
- "modified": "2015-10-02 07:38:39.149782", 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2015-12-04 11:01:24.286320", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Bank Reconciliation Detail", 
 "owner": "Administrator", 
 "permissions": [], 
 "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "version": 0
 }
--- 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.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -368,10 +368,6 @@ frappe.ui.form.on("Journal Entry Account", {

 	credit: function(frm, dt, dn) {
 		cur_frm.cscript.update_totals(frm.doc);
-	},
-
-	exchange_rate: function(frm, cdt, cdn) {
-		erpnext.journal_entry.set_debit_credit_in_company_currency(frm, cdt, cdn);
 	}
 })

@@ -418,7 +414,7 @@ $.extend(erpnext.journal_entry, {

 		if(row.account_currency == company_currency || !frm.doc.multi_currency) {
 			frappe.model.set_value(cdt, cdn, "exchange_rate", 1);
-		} else if (!row.exchange_rate || row.account_type == "Bank") {
+		} else if (!row.exchange_rate || row.exchange_rate == 1 || row.account_type == "Bank") {
 			frappe.call({
 				method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_exchange_rate",
 				args: {
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.json
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.json
@@ -19,10 +19,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "icon-flag", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -42,10 +44,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Title", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -64,13 +68,15 @@
   "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", 
   "options": "Journal Entry\nBank Entry\nCash Entry\nCredit Card Entry\nDebit Note\nCredit Note\nContra Entry\nExcise Entry\nWrite Off Entry\nOpening Entry", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -88,13 +94,15 @@
   "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", 
   "options": "JV-", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -112,10 +120,12 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -135,11 +145,13 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Posting Date", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "posting_date", 
   "oldfieldtype": "Date", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -158,11 +170,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-table", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -181,12 +195,14 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Accounting Entries", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "entries", 
   "oldfieldtype": "Table", 
   "options": "Journal Entry Account", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -204,9 +220,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, 
@@ -226,11 +244,13 @@
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Reference Number", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "cheque_no", 
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -249,11 +269,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Reference Date", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "cheque_date", 
   "oldfieldtype": "Date", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -272,11 +294,13 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "User Remark", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "user_remark", 
   "oldfieldtype": "Small Text", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -294,9 +318,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, 
@@ -315,12 +341,14 @@
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Total Debit", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "total_debit", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -339,12 +367,14 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Total Credit", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "total_credit", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -364,12 +394,14 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Difference (Dr - Cr)", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "difference", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -389,10 +421,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Make Difference Entry", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Button", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -411,10 +445,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Multi Currency", 
+   "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, 
@@ -433,10 +469,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total Amount", 
+   "length": 0, 
   "no_copy": 1, 
-   "options": "Company:company:default_currency", 
+   "options": "", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 1, 
   "reqd": 0, 
@@ -455,9 +493,11 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total Amount in Words", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 1, 
   "reqd": 0, 
@@ -476,10 +516,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Reference", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "icon-pushpin", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -498,11 +540,13 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Clearance Date", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "clearance_date", 
   "oldfieldtype": "Date", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -522,11 +566,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Remark", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "remark", 
   "oldfieldtype": "Small Text", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -544,9 +590,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, 
@@ -565,11 +613,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Bill No", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "bill_no", 
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -588,11 +638,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Bill Date", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "bill_date", 
   "oldfieldtype": "Date", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -611,11 +663,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Due Date", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "due_date", 
   "oldfieldtype": "Date", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -635,10 +689,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Write Off", 
+   "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, 
@@ -658,11 +714,13 @@
   "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, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 1, 
   "reqd": 0, 
@@ -682,10 +740,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Get Outstanding Invoices", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "get_outstanding_invoices", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -703,10 +763,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, 
@@ -726,10 +788,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Write Off Amount", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 1, 
   "reqd": 0, 
@@ -748,10 +812,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Printing Settings", 
+   "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, 
@@ -770,9 +836,11 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Pay To / Recd From", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 1, 
   "reqd": 0, 
@@ -790,10 +858,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, 
@@ -812,10 +882,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Letter Head", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Letter Head", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -834,12 +906,14 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Print Heading", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "select_print_heading", 
   "oldfieldtype": "Link", 
   "options": "Print Heading", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 1, 
   "reqd": 0, 
@@ -858,11 +932,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "More Information", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-file-text", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -881,12 +957,14 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Company", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "company", 
   "oldfieldtype": "Link", 
   "options": "Company", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -905,12 +983,14 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Fiscal Year", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "fiscal_year", 
   "oldfieldtype": "Select", 
   "options": "Fiscal Year", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -928,10 +1008,12 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -952,13 +1034,15 @@
   "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", 
   "options": "No\nYes", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -978,11 +1062,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Stock Entry", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Stock Entry", 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1001,12 +1087,14 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Amended From", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "amended_from", 
   "oldfieldtype": "Link", 
   "options": "Journal Entry", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1024,7 +1112,9 @@
 "is_submittable": 1, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2015-10-02 07:38:54.074343", 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2015-11-30 16:11:45.556341", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Journal Entry", 
@@ -1096,5 +1186,6 @@
 "search_fields": "voucher_type,posting_date, due_date, cheque_no", 
 "sort_field": "modified", 
 "sort_order": "DESC", 
- "title_field": "title"
+ "title_field": "title", 
+ "version": 0
 }
--- 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"))
@@ -293,7 +295,7 @@ class JournalEntry(AccountsController):
 		for d in self.get("accounts"):
 			if d.account_currency == self.company_currency:
 				d.exchange_rate = 1
-			elif not d.exchange_rate or d.account_type=="Bank" or \
+			elif not d.exchange_rate or d.exchange_rate == 1 or \
 				(d.reference_type in ("Sales Invoice", "Purchase Invoice") and d.reference_name):
 					d.exchange_rate = get_exchange_rate(d.account, d.account_currency, self.company,
 						d.reference_type, d.reference_name, d.debit, d.credit, d.exchange_rate)
@@ -337,20 +339,24 @@ class JournalEntry(AccountsController):
 			self.remark = ("\n").join(r) #User Remarks is not mandatory

 	def set_print_format_fields(self):
+		total_amount = 0.0
+		bank_account_currency = None
 		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)
+				bank_account_currency = d.account_currency

-	def set_total_amount(self, amt):
+		self.set_total_amount(total_amount, bank_account_currency)
+
+	def set_total_amount(self, amt, currency):
 		self.total_amount = amt
 		from frappe.utils import money_in_words
-		self.total_amount_in_words = money_in_words(amt, self.company_currency)
+		self.total_amount_in_words = money_in_words(amt, currency)

 	def make_gl_entries(self, cancel=0, adv_adj=0):
 		from erpnext.accounts.general_ledger import make_gl_entries
@@ -404,7 +410,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 +438,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 +526,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 +542,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 +561,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 +603,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 +612,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 +625,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 +641,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 +658,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"
@@ -728,6 +743,11 @@ def get_account_balance_and_party_type(account, date, company, debit=None, credi
 		"exchange_rate": get_exchange_rate(account, account_details.account_currency,
 			company, debit=debit, credit=credit, exchange_rate=exchange_rate)
 	}
+
+	# un-set party if not party type
+	if not party_type:
+		grid_values["party"] = ""
+
 	return grid_values

@frappe.whitelist()
@@ -737,6 +757,9 @@ def get_exchange_rate(account, account_currency=None, company=None,
 	account_details = frappe.db.get_value("Account", account,
 		["account_type", "root_type", "account_currency", "company"], as_dict=1)

+	if not account_details:
+		frappe.throw(_("Please select correct account"))
+
 	if not company:
 		company = account_details.company

--- a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
+++ b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
@@ -10,7 +10,7 @@
 "fields": [
  {
   "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
   "collapsible": 0, 
   "fieldname": "account", 
   "fieldtype": "Link", 
@@ -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, 
@@ -308,7 +334,7 @@
  }, 
  {
   "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
   "collapsible": 0, 
   "fieldname": "debit_in_account_currency", 
   "fieldtype": "Currency", 
@@ -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, 
@@ -331,7 +359,7 @@
  }, 
  {
   "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
   "collapsible": 0, 
   "fieldname": "debit", 
   "fieldtype": "Currency", 
@@ -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, 
@@ -376,7 +408,7 @@
  }, 
  {
   "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
   "collapsible": 0, 
   "fieldname": "credit_in_account_currency", 
   "fieldtype": "Currency", 
@@ -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, 
@@ -399,7 +433,7 @@
  }, 
  {
   "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
   "collapsible": 0, 
   "fieldname": "credit", 
   "fieldtype": "Currency", 
@@ -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-12-02 04:14:37.571883", 
 "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
@@ -6,6 +6,7 @@ import frappe
 from frappe.utils import flt
 from frappe import msgprint, _
 from frappe.model.document import Document
+from erpnext.accounts.utils import get_outstanding_invoices

 class PaymentReconciliation(Document):
 	def get_unreconciled_entries(self):
@@ -17,7 +18,7 @@ class PaymentReconciliation(Document):
 		dr_or_cr = "credit_in_account_currency" if self.party_type == "Customer" \
 			else "debit_in_account_currency"

-		cond = self.check_condition(dr_or_cr)
+		cond = self.check_condition()

 		bank_account_condition = "t2.against_account like %(bank_cash_account)s" \
 				if self.bank_cash_account else "1=1"
@@ -32,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')
@@ -65,65 +66,11 @@ class PaymentReconciliation(Document):

 	def get_invoice_entries(self):
 		#Fetch JVs, Sales and Purchase Invoices for 'invoices' to reconcile against
-		non_reconciled_invoices = []
-		dr_or_cr = "debit_in_account_currency" if self.party_type == "Customer" else "credit_in_account_currency"
-		cond = self.check_condition(dr_or_cr)

-		invoice_list = frappe.db.sql("""
-			select
-				voucher_no, voucher_type, posting_date,
-				ifnull(sum({dr_or_cr}), 0) as invoice_amount
-			from
-				`tabGL Entry`
-			where
-				party_type = %(party_type)s and party = %(party)s
-				and account = %(account)s and {dr_or_cr} > 0 {cond}
-				and (CASE
-					WHEN voucher_type = 'Journal Entry'
-					THEN ifnull(against_voucher, '') = ''
-					ELSE 1=1
-				END)
-			group by voucher_type, voucher_no
-		""".format(**{
-			"cond": cond,
-			"dr_or_cr": dr_or_cr
-		}), {
-			"party_type": self.party_type,
-			"party": self.party,
-			"account": self.receivable_payable_account,
-		}, as_dict=True)
+		condition = self.check_condition()

-		for d in invoice_list:
-			payment_amount = frappe.db.sql("""
-				select
-					ifnull(sum(ifnull({0}, 0)), 0)
-				from
-					`tabGL Entry`
-				where
-					party_type = %(party_type)s and party = %(party)s
-					and account = %(account)s and {0} > 0
-					and against_voucher_type = %(against_voucher_type)s
-					and ifnull(against_voucher, '') = %(against_voucher)s
-			""".format("credit_in_account_currency" if self.party_type == "Customer" 
-				else "debit_in_account_currency"), {
-					"party_type": self.party_type,
-					"party": self.party,
-					"account": self.receivable_payable_account,
-					"against_voucher_type": d.voucher_type,
-					"against_voucher": d.voucher_no
-				}
-			)
-
-			payment_amount = payment_amount[0][0] if payment_amount else 0
-
-			if d.invoice_amount - payment_amount > 0.005:
-				non_reconciled_invoices.append({
-					'voucher_no': d.voucher_no,
-					'voucher_type': d.voucher_type,
-					'posting_date': d.posting_date,
-					'invoice_amount': flt(d.invoice_amount),
-					'outstanding_amount': flt(d.invoice_amount - payment_amount, 2)
-				})
+		non_reconciled_invoices = get_outstanding_invoices(self.party_type, self.party,
+			self.receivable_payable_account, condition=condition)

 		self.add_invoice_entries(non_reconciled_invoices)

@@ -210,13 +157,18 @@ class PaymentReconciliation(Document):
 		if not invoices_to_reconcile:
 			frappe.throw(_("Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row"))

-	def check_condition(self, dr_or_cr):
-		cond = self.from_date and " and posting_date >= '" + self.from_date + "'" or ""
-		cond += self.to_date and " and posting_date <= '" + self.to_date + "'" or ""
+	def check_condition(self):
+		cond = " and posting_date >= {0}".format(frappe.db.escape(self.from_date)) if self.from_date else ""
+		cond += " and posting_date <= {0}".format(frappe.db.escape(self.to_date)) if self.to_date else ""
+
+		if self.party_type == "Customer":
+			dr_or_cr = "debit_in_account_currency"
+		else:
+			dr_or_cr = "credit_in_account_currency"

 		if self.minimum_amount:
-			cond += " and {0} >= %s".format(dr_or_cr) % self.minimum_amount
+			cond += " and `{0}` >= {1}".format(dr_or_cr, flt(self.minimum_amount))
 		if self.maximum_amount:
-			cond += " and {0} <= %s".format(dr_or_cr) % self.maximum_amount
+			cond += " and `{0}` <= {1}".format(dr_or_cr, flt(self.maximum_amount))

 		return cond
--- 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()

@@ -63,20 +101,18 @@ def get_outstanding_vouchers(args):
 	party_account_currency = get_account_currency(args.get("party_account"))
 	company_currency = frappe.db.get_value("Company", args.get("company"), "default_currency")

-	if args.get("party_type") == "Customer" and args.get("received_or_paid") == "Received":
-		amount_query = "ifnull(debit_in_account_currency, 0) - ifnull(credit_in_account_currency, 0)"
-	elif args.get("party_type") == "Supplier" and args.get("received_or_paid") == "Paid":
-		amount_query = "ifnull(credit_in_account_currency, 0) - ifnull(debit_in_account_currency, 0)"
-	else:
+	if ((args.get("party_type") == "Customer" and args.get("received_or_paid") == "Paid")
+		or (args.get("party_type") == "Supplier" and args.get("received_or_paid") == "Received")):
+
 		frappe.throw(_("Please enter the Against Vouchers manually"))

 	# Get all outstanding sales /purchase invoices
-	outstanding_invoices = get_outstanding_invoices(amount_query, args.get("party_account"),
-		args.get("party_type"), args.get("party"))
+	outstanding_invoices = get_outstanding_invoices(args.get("party_type"), args.get("party"), args.get("party_account"))

 	# Get all SO / PO which are not fully billed or aginst which full advance not paid
 	orders_to_be_billed = get_orders_to_be_billed(args.get("party_type"), args.get("party"),
 		party_account_currency, company_currency)
+
 	return outstanding_invoices + orders_to_be_billed

 def get_orders_to_be_billed(party_type, party, party_account_currency, company_currency):
@@ -87,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}`
@@ -96,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,
@@ -118,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)
@@ -127,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
@@ -59,7 +59,7 @@ class PricingRule(Document):
 					self.set(f, None)

 	def validate_price_or_discount(self):
-		for field in ["Price", "Discount Percentage"]:
+		for field in ["Price"]:
 			if flt(self.get(frappe.scrub(field))) < 0:
 				throw(_("{0} can not be negative").format(field))

@@ -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.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -24,7 +24,7 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({

 		if(!doc.is_return) {
 			if(doc.docstatus==1) {
-				if(doc.outstanding_amount > 0) {
+				if(doc.outstanding_amount != 0) {
 					this.frm.add_custom_button(__('Payment'), this.make_bank_entry).addClass("btn-primary");
 				}
 				cur_frm.add_custom_button(__('Debit Note'), this.make_debit_note);
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
--- 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)
@@ -150,10 +150,14 @@ class PurchaseInvoice(BuyingController):
 		against_accounts = []
 		stock_items = self.get_stock_items()
 		for item in self.get("items"):
+			# in case of auto inventory accounting, 
+			# against expense account is always "Stock Received But Not Billed"
+			# for a stock item and if not epening entry and not drop-ship entry
+			
 			if auto_accounting_for_stock and item.item_code in stock_items \
-					and self.is_opening == 'No':
-				# in case of auto inventory accounting, against expense account is always
-				# Stock Received But Not Billed for a stock item
+				and self.is_opening == 'No' and (not item.po_detail or 
+					not frappe.db.get_value("Purchase Order Item", item.po_detail, "delivered_by_supplier")):
+				
 				item.expense_account = stock_not_billed_account
 				item.cost_center = None

@@ -176,9 +180,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 +400,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 +443,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,8 +48,9 @@ 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}
-			i.name""".format(condition=condition, order_by=order_by), args, as_dict=1)
+			i.name
+		limit 24""".format(condition=condition, order_by=order_by), args, as_dict=1)
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -64,6 +64,7 @@ class SalesInvoice(SellingController):
 			self.validate_pos()

 		if cint(self.update_stock):
+			self.validate_dropship_item()
 			self.validate_item_code()
 			self.validate_warehouse()
 			self.update_current_stock()
@@ -155,7 +156,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 +360,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 +380,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))
@@ -407,6 +410,12 @@ class SalesInvoice(SellingController):
 		if self.c_form_applicable == 'Yes' and self.c_form_no:
 			msgprint(_("Please remove this Invoice {0} from C-Form {1}")
 				.format(self.name, self.c_form_no), raise_exception = 1)
+	
+	def validate_dropship_item(self):
+		for item in self.items:
+			if item.sales_order:
+				if frappe.db.get_value("Sales Order Item", item.so_detail, "delivered_by_supplier"):
+					frappe.throw(_("Could not update stock, invoice contains drop shipping item."))

 	def update_current_stock(self):
 		for d in self.get('items'):
@@ -434,7 +443,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.js
+++ b/erpnext/accounts/doctype/tax_rule/tax_rule.js
@@ -4,19 +4,26 @@
 cur_frm.add_fetch("customer", "customer_group", "customer_group" );
 cur_frm.add_fetch("supplier", "supplier_type", "supplier_type" );

-cur_frm.toggle_reqd("sales_tax_template", cur_frm.doc.tax_type=="Sales");
-cur_frm.toggle_reqd("purchase_tax_template", cur_frm.doc.tax_type=="Purchase");
-
+frappe.ui.form.on("Tax Rule", "tax_type", function(frm) {
+	frm.toggle_reqd("sales_tax_template", frm.doc.tax_type=="Sales");
+	frm.toggle_reqd("purchase_tax_template", frm.doc.tax_type=="Purchase");
+})

 frappe.ui.form.on("Tax Rule", "onload", function(frm) {
-	if(frm.doc.__islocal){
+	if(frm.doc.__islocal) {
 		frm.set_value("use_for_shopping_cart", 1);
 	}
 })

+frappe.ui.form.on("Tax Rule", "refresh", function(frm) {
+	frappe.ui.form.trigger("Tax Rule", "tax_type");
+})
+
 frappe.ui.form.on("Tax Rule", "use_for_shopping_cart", function(frm) {
-	if(!frm.doc.use_for_shopping_cart && (frappe.get_list("Tax Rule", {"use_for_shopping_cart":1}).length == 0)){
-		frappe.model.get_value("Shopping Cart Settings", "Shopping Cart Settings", "enabled", function(docfield) {
+	if(!frm.doc.use_for_shopping_cart && 
+			(frappe.get_list("Tax Rule", {"use_for_shopping_cart":1}).length == 0)) {
+		frappe.model.get_value("Shopping Cart Settings", "Shopping Cart Settings", 
+				"enabled", function(docfield) {
 			if(docfield.enabled){
 				frm.set_value("use_for_shopping_cart", 1);
 				frappe.throw(__("Shopping Cart is enabled"));
--- 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.js
+++ b/erpnext/accounts/page/accounts_browser/accounts_browser.js
@@ -117,7 +117,7 @@ erpnext.AccountsChart = Class.extend({
 					}
 				},
 				{
-					condition: function(node) { return !node.root && node.expandable; },
+					condition: function(node) { return node.expandable; },
 					label: __("Add Child"),
 					click: function() {
 						me.make_new()
@@ -146,7 +146,7 @@ erpnext.AccountsChart = Class.extend({
 					label: __("Rename"),
 					click: function(node) {
 						frappe.model.rename_doc(me.ctype, node.label, function(new_name) {
-							node.reload();
+							node.reload_parent();
 						});
 					},
 					btnClass: "hidden-xs"
@@ -166,7 +166,10 @@ erpnext.AccountsChart = Class.extend({
 				var dr_or_cr = node.data.balance < 0 ? "Cr" : "Dr";
 				if (me.ctype == 'Account' && node.data && node.data.balance!==undefined) {
 					$('<span class="balance-area pull-right text-muted small">'
-						+ format_currency(Math.abs(node.data.balance), node.data.account_currency)
+						+ (node.data.balance_in_account_currency ?
+							(format_currency(Math.abs(node.data.balance_in_account_currency),
+								node.data.account_currency) + " / ") : "")
+						+ format_currency(Math.abs(node.data.balance), node.data.company_currency)
 						+ " " + dr_or_cr
 						+ '</span>').insertBefore(node.$ul);
 				}
@@ -208,12 +211,15 @@ erpnext.AccountsChart = Class.extend({
 					description: __("Name of new Account. Note: Please don't create accounts for Customers and Suppliers")},
 				{fieldtype:'Check', fieldname:'is_group', label:__('Is Group'),
 					description: __('Further accounts can be made under Groups, but entries can be made against non-Groups')},
+				{fieldtype:'Select', fieldname:'root_type', label:__('Root Type'),
+					options: ['Asset', 'Liability', 'Equity', 'Income', 'Expense'].join('\n'),
+				},
 				{fieldtype:'Select', fieldname:'account_type', label:__('Account Type'),
 					options: ['', 'Bank', 'Cash', 'Warehouse', 'Tax', 'Chargeable'].join('\n'),
 					description: __("Optional. This setting will be used to filter in various transactions.") },
 				{fieldtype:'Float', fieldname:'tax_rate', label:__('Tax Rate')},
 				{fieldtype:'Link', fieldname:'warehouse', label:__('Warehouse'), options:"Warehouse"},
-				{fieldtype:'Link', fieldname:'account_currency', label:__('Currency'), options:"Currency", 
+				{fieldtype:'Link', fieldname:'account_currency', label:__('Currency'), options:"Currency",
 					description: __("Optional. Sets company's default currency, if not specified.")}
 			]
 		})
@@ -238,6 +244,9 @@ erpnext.AccountsChart = Class.extend({
 			$(fd.warehouse.wrapper).toggle(fd.account_type.get_value()==='Warehouse');
 		})

+		// root type if root
+		$(fd.root_type.wrapper).toggle(node.root);
+
 		// create
 		d.set_primary_action(__("Create New"), function() {
 			var btn = this;
@@ -253,6 +262,14 @@ erpnext.AccountsChart = Class.extend({
 			v.parent_account = node.label;
 			v.company = me.company;

+			if(node.root) {
+				v.is_root = true;
+				v.parent_account = null;
+			} else {
+				v.is_root = false;
+				v.root_type = null;
+			}
+
 			return frappe.call({
 				args: v,
 				method: 'erpnext.accounts.utils.add_ac',
@@ -261,7 +278,7 @@ erpnext.AccountsChart = Class.extend({
 					if(node.expanded) {
 						node.toggle_node();
 					}
-					node.reload();
+					node.load();
 				}
 			});
 		});
@@ -307,7 +324,7 @@ erpnext.AccountsChart = Class.extend({
 					if(node.expanded) {
 						node.toggle_node();
 					}
-					node.reload();
+					node.load();
 				}
 			});
 		});
--- a/erpnext/accounts/page/accounts_browser/accounts_browser.py
+++ b/erpnext/accounts/page/accounts_browser/accounts_browser.py
@@ -18,33 +18,40 @@ def get_companies():
 def get_children():
 	args = frappe.local.form_dict
 	ctype, company = args['ctype'], args['comp']
+	fieldname = frappe.db.escape(ctype.lower().replace(' ','_'))
+	doctype = frappe.db.escape(ctype)

 	# root
 	if args['parent'] in ("Accounts", "Cost Centers"):
-		select_cond = ", root_type, report_type, account_currency" if ctype=="Account" else ""
+		fields = ", root_type, report_type, account_currency" if ctype=="Account" else ""
 		acc = frappe.db.sql(""" select
-			name as value, is_group as expandable %s
-			from `tab%s`
-			where ifnull(parent_%s,'') = ''
+			name as value, is_group as expandable {fields}
+			from `tab{doctype}`
+			where ifnull(`parent_{fieldname}`,'') = ''
 			and `company` = %s	and docstatus<2
-			order by name""" % (select_cond, ctype, ctype.lower().replace(' ','_'), '%s'),
+			order by name""".format(fields=fields, fieldname = fieldname, doctype=doctype),
 				company, as_dict=1)

 		if args["parent"]=="Accounts":
 			sort_root_accounts(acc)
 	else:
 		# other
-		select_cond = ", account_currency" if ctype=="Account" else ""
+		fields = ", account_currency" if ctype=="Account" else ""
 		acc = frappe.db.sql("""select
-			name as value, is_group as expandable %s
-	 		from `tab%s`
-			where ifnull(parent_%s,'') = %s
+			name as value, is_group as expandable, parent_{fieldname} as parent {fields}
+	 		from `tab{doctype}`
+			where ifnull(`parent_{fieldname}`,'') = %s
 			and docstatus<2
-			order by name""" % (select_cond, ctype, ctype.lower().replace(' ','_'), '%s'),
+			order by name""".format(fields=fields, fieldname=fieldname, doctype=doctype),
 				args['parent'], as_dict=1)

 	if ctype == 'Account':
+		company_currency = frappe.db.get_value("Company", company, "default_currency")
 		for each in acc:
-			each["balance"] = flt(get_balance_on(each.get("value")))
+			each["company_currency"] = company_currency
+			each["balance"] = flt(get_balance_on(each.get("value"), in_account_currency=False))
+
+			if each.account_currency != company_currency:
+				each["balance_in_account_currency"] = flt(get_balance_on(each.get("value")))

 	return acc
--- 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
@@ -24,7 +24,7 @@ class ReceivablePayableReport(object):
 		if party_naming_by == "Naming Series":
 			columns += [args.get("party_type") + " Name::110"]

-		columns += [_("Voucher Type") + "::110", _("Voucher No") + ":Dynamic Link/Voucher Type:120",
+		columns += [_("Voucher Type") + "::110", _("Voucher No") + ":Dynamic Link/"+_("Voucher Type")+":120",
 			_("Due Date") + ":Date:80"]

 		if args.get("party_type") == "Supplier":
@@ -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.html
+++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html
@@ -2,7 +2,7 @@
 	{%= frappe.boot.letter_heads[frappe.defaults.get_default("letter_head")] %}
 </div>
 <h2 class="text-center">{%= __("Bank Reconciliation Statement") %}</h2>
-<h4 class="text-center">{%= filters.account && (filters.account + ", ")  || "" %} {%= filters.company %}</h4>
+<h4 class="text-center">{%= filters.account %}</h4>
 <hr>
 <table class="table table-bordered">
 	<thead>
@@ -16,31 +16,31 @@
 	</thead>
 	<tbody>
 		{% for(var i=0, l=data.length; i<l; i++) { %}
-			{% if (data[i][__("Posting Date")]) { %}
+			{% if (data[i]["posting_date"]) { %}
 			<tr>
-				<td>{%= dateutil.str_to_user(data[i][__("Posting Date")]) %}</td>
-				<td>{%= data[i][__("Journal Entry")] %}</td>
-				<td>{%= __("Against") %}: {%= data[i][__("Against Account")] %}
-					{% if (data[i][__("Reference")]) { %}
-						<br>{%= __("Reference") %}: {%= data[i][__("Reference")] %}
-						{% if (data[i][__("Ref Date")]) { %}
-							<br>{%= __("Reference Date") %}: {%= dateutil.str_to_user(data[i][__("Ref Date")]) %}
+				<td>{%= dateutil.str_to_user(data[i]["posting_date"]) %}</td>
+				<td>{%= data[i]["journal_entry"] %}</td>
+				<td>{%= __("Against") %}: {%= data[i]["against_account"] %}
+					{% if (data[i]["reference"]) { %}
+						<br>{%= __("Reference") %}: {%= data[i]["reference"] %}
+						{% if (data[i]["ref_date"]) { %}
+							<br>{%= __("Reference Date") %}: {%= dateutil.str_to_user(data[i]["ref_date"]) %}
 						{% } %}
 					{% } %}
-					{% if (data[i][__("Clearance Date")]) { %}
-						<br>{%= __("Clearance Date") %}: {%= dateutil.str_to_user(data[i][__("Clearance Date")]) %}
+					{% if (data[i]["clearance_date"]) { %}
+						<br>{%= __("Clearance Date") %}: {%= dateutil.str_to_user(data[i]["clearance_date"]) %}
 					{% } %}
 				</td>
-				<td style="text-align: right">{%= format_currency(data[i][__("Debit")]) %}</td>
-				<td style="text-align: right">{%= format_currency(data[i][__("Credit")]) %}</td>
+				<td style="text-align: right">{%= format_currency(data[i]["debit"]) %}</td>
+				<td style="text-align: right">{%= format_currency(data[i]["credit"]) %}</td>
 			</tr>
 			{% } else { %}
 			<tr>
 				<td></td>
 				<td></td>
-				<td>{%= data[i][__("Journal Entry")] %}</td>
-				<td style="text-align: right">{%= format_currency(data[i][__("Debit")]) %}</td>
-				<td style="text-align: right">{%= format_currency(data[i][__("Credit")]) %}</td>
+				<td>{%= data[i]["journal_entry"] %}</td>
+				<td style="text-align: right">{%= format_currency(data[i]["debit"]) %}</td>
+				<td style="text-align: right">{%= format_currency(data[i]["credit"]) %}</td>
 			</tr>
 			{% } %}
 		{% } %}
--- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
+++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
@@ -12,19 +12,21 @@ def execute(filters=None):
 	columns = get_columns()

 	if not filters.get("account"): return columns, []
+	
+	account_currency = frappe.db.get_value("Account", filters.account, "account_currency")

 	data = get_entries(filters)
-
+	
 	from erpnext.accounts.utils import get_balance_on
 	balance_as_per_system = get_balance_on(filters["account"], filters["report_date"])

 	total_debit, total_credit = 0,0
 	for d in data:
-		total_debit += flt(d[2])
-		total_credit += flt(d[3])
+		total_debit += flt(d.debit)
+		total_credit += flt(d.credit)

 	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'
@@ -37,39 +39,112 @@ def execute(filters=None):
 		+ amounts_not_reflected_in_system

 	data += [
-		get_balance_row(_("System Balance"), balance_as_per_system),
-		[""]*len(columns),
-		["", '"' + _("Amounts not reflected in bank") + '"', total_debit, total_credit, "", "", "", "", ""],
-		get_balance_row(_("Amounts not reflected in system"), amounts_not_reflected_in_system),
-		[""]*len(columns),
-		get_balance_row(_("Expected balance as per bank"), bank_bal)
+		get_balance_row(_("System Balance"), balance_as_per_system, account_currency),
+		{},
+		{
+			"journal_entry": '"' + _("Amounts not reflected in bank") + '"',
+			"debit": total_debit,
+			"credit": total_credit,
+			"account_currency": account_currency
+		},
+		get_balance_row(_("Amounts not reflected in system"), amounts_not_reflected_in_system, 
+			account_currency),
+		{},
+		get_balance_row(_("Expected balance as per bank"), bank_bal, account_currency)
 	]

 	return columns, data

 def get_columns():
-	return [_("Posting Date") + ":Date:100", _("Journal Entry") + ":Link/Journal Entry:220",
-		_("Debit") + ":Currency:120", _("Credit") + ":Currency:120",
-		_("Against Account") + ":Link/Account:200", _("Reference") + "::100", 
-		_("Ref Date") + ":Date:110", _("Clearance Date") + ":Date:110", _("Currency") + ":Link/Currency:70"
+	return [
+		{
+			"fieldname": "posting_date",
+			"label": _("Posting Date"),
+			"fieldtype": "Date",
+			"width": 100
+		},
+		{
+			"fieldname": "journal_entry",
+			"label": _("Journal Entry"),
+			"fieldtype": "Link",
+			"options": "Journal Entry",
+			"width": 220
+		},
+		{
+			"fieldname": "debit",
+			"label": _("Debit"),
+			"fieldtype": "Currency",
+			"options": "account_currency",
+			"width": 120
+		},
+		{
+			"fieldname": "credit",
+			"label": _("Credit"),
+			"fieldtype": "Currency",
+			"options": "account_currency",
+			"width": 120
+		},
+		{
+			"fieldname": "against_account",
+			"label": _("Against Account"),
+			"fieldtype": "Link",
+			"options": "Account",
+			"width": 200
+		},
+		{
+			"fieldname": "reference",
+			"label": _("Reference"),
+			"fieldtype": "Data",
+			"width": 100
+		},
+		{
+			"fieldname": "ref_date",
+			"label": _("Ref Date"),
+			"fieldtype": "Date",
+			"width": 110
+		},
+		{
+			"fieldname": "clearance_date",
+			"label": _("Clearance Date"),
+			"fieldtype": "Date",
+			"width": 110
+		},		
+		{
+			"fieldname": "account_currency",
+			"label": _("Currency"),
+			"fieldtype": "Link",
+			"options": "Currency",
+			"width": 100
+		}
 	]

 def get_entries(filters):
 	entries = frappe.db.sql("""select
-			jv.posting_date, jv.name, jvd.debit_in_account_currency, jvd.credit_in_account_currency,
-			jvd.against_account, jv.cheque_no, jv.cheque_date, jv.clearance_date, jvd.account_currency
+			jv.posting_date, jv.name as journal_entry, jvd.debit_in_account_currency as debit, 
+			jvd.credit_in_account_currency as credit, jvd.against_account, 
+			jv.cheque_no as reference, jv.cheque_date as ref_date, jv.clearance_date, jvd.account_currency
 		from
 			`tabJournal Entry Account` jvd, `tabJournal Entry` jv
 		where jvd.parent = jv.name and jv.docstatus=1
 			and jvd.account = %(account)s and jv.posting_date <= %(report_date)s
 			and ifnull(jv.clearance_date, '4000-01-01') > %(report_date)s
 			and ifnull(jv.is_opening, 'No') = 'No'
-		order by jv.name DESC""", filters, as_list=1)
+		order by jv.name DESC""", filters, as_dict=1)

 	return entries

-def get_balance_row(label, amount):
+def get_balance_row(label, amount, account_currency):
 	if amount > 0:
-		return ["", '"' + label + '"', amount, 0, "", "", "", "", ""]
+		return {
+			"journal_entry": '"' + label + '"',
+			"debit": amount,
+			"credit": 0,
+			"account_currency": account_currency
+		}
 	else:
-		return ["", '"' + label + '"', 0, abs(amount), "", "", "", "", ""]
+		return {
+			"journal_entry": '"' + label + '"',
+			"debit": 0,
+			"credit": abs(amount),
+			"account_currency": account_currency
+		}
--- a/erpnext/buying/print_format/drop_shipping/init.py
+++ b/erpnext/buying/print_format/drop_shipping/init.py
--- a/erpnext/accounts/report/cash_flow/cash_flow.js
+++ b/erpnext/accounts/report/cash_flow/cash_flow.js
@@ -0,0 +1,6 @@
+// Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.require("assets/erpnext/js/financial_statements.js");
+
+frappe.query_reports["Cash Flow"] = erpnext.financial_statements;
--- a/erpnext/accounts/report/cash_flow/cash_flow.json
+++ b/erpnext/accounts/report/cash_flow/cash_flow.json
@@ -0,0 +1,18 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2015-12-12 10:22:45.383203", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "modified": "2015-12-12 10:22:45.383203", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Cash Flow", 
+ "owner": "Administrator", 
+ "ref_doctype": "GL Entry", 
+ "report_name": "Cash Flow", 
+ "report_type": "Script Report"
+}
--- a/erpnext/accounts/report/cash_flow/cash_flow.py
+++ b/erpnext/accounts/report/cash_flow/cash_flow.py
@@ -0,0 +1,134 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from erpnext.accounts.report.financial_statements import (get_period_list, get_columns, get_data)
+from erpnext.accounts.report.profit_and_loss_statement.profit_and_loss_statement import get_net_profit_loss
+
+
+def execute(filters=None):
+	period_list = get_period_list(filters.fiscal_year, filters.periodicity)
+
+	operation_accounts = {
+		"section_name": "Operations",
+		"section_footer": _("Net Cash from Operations"),
+		"section_header": _("Cash Flow from Operations"),
+		"account_types": [
+			{"account_type": "Depreciation", "label": _("Depreciation")},
+			{"account_type": "Receivable", "label": _("Net Change in Accounts Receivable")},
+			{"account_type": "Payable", "label": _("Net Change in Accounts Payable")},
+			{"account_type": "Warehouse", "label": _("Net Change in Inventory")}
+		]
+	}
+
+	investing_accounts = {
+		"section_name": "Investing",
+		"section_footer": _("Net Cash from Investing"),
+		"section_header": _("Cash Flow from Investing"),
+		"account_types": [
+			{"account_type": "Fixed Asset", "label": _("Net Change in Fixed Asset")}
+		]
+	}
+
+	financing_accounts = {
+		"section_name": "Financing",
+		"section_footer": _("Net Cash from Financing"),
+		"section_header": _("Cash Flow from Financing"),
+		"account_types": [
+			{"account_type": "Equity", "label": _("Net Change in Equity")}
+		]
+	}
+
+	# combine all cash flow accounts for iteration
+	cash_flow_accounts = []
+	cash_flow_accounts.append(operation_accounts)
+	cash_flow_accounts.append(investing_accounts)
+	cash_flow_accounts.append(financing_accounts)
+
+	# compute net profit / loss
+	income = get_data(filters.company, "Income", "Credit", period_list, ignore_closing_entries=True)
+	expense = get_data(filters.company, "Expense", "Debit", period_list, ignore_closing_entries=True)
+	net_profit_loss = get_net_profit_loss(income, expense, period_list)
+
+	data = []
+
+	for cash_flow_account in cash_flow_accounts:
+
+		section_data = []
+		data.append({
+			"account_name": cash_flow_account['section_header'], 
+			"parent_account": None,
+			"indent": 0.0, 
+			"account": cash_flow_account['section_header']
+		})
+
+		if len(data) == 1:
+			# add first net income in operations section
+			if net_profit_loss:
+				net_profit_loss.update({
+					"indent": 1, 
+					"parent_account": operation_accounts['section_header']
+				})
+				data.append(net_profit_loss)
+				section_data.append(net_profit_loss)
+
+		for account in cash_flow_account['account_types']:
+			account_data = get_account_type_based_data(filters.company, account['account_type'], period_list)
+			account_data.update({
+				"account_name": account['label'], 
+				"indent": 1,
+				"parent_account": cash_flow_account['section_header']
+			})
+			data.append(account_data)
+			section_data.append(account_data)
+
+		add_total_row_account(data, section_data, cash_flow_account['section_footer'], period_list)
+
+	add_total_row_account(data, data, _("Net Change in Cash"), period_list)
+	columns = get_columns(period_list)
+
+	return columns, data
+
+
+def get_account_type_based_data(company, account_type, period_list):
+	data = {}
+	for period in period_list:
+		gl_sum = frappe.db.sql_list("""
+			select sum(credit) - sum(debit)
+			from `tabGL Entry`
+			where company=%s and posting_date >= %s and posting_date <= %s 
+				and voucher_type != 'Period Closing Voucher'
+				and account in ( SELECT name FROM tabAccount WHERE account_type = %s)
+		""", (company, period['from_date'], period['to_date'], account_type))
+		
+		if gl_sum and gl_sum[0]:
+			amount = gl_sum[0]
+			if account_type == "Depreciation":
+				amount *= -1
+		else:
+			amount = 0
+		
+		data.update({
+			"from_date": period['from_date'], 
+			"to_date": period['to_date'], 
+			period["key"]: amount
+		})
+	return data
+
+
+def add_total_row_account(out, data, label, period_list):
+	total_row = {
+		"account_name": "'" + _("{0}").format(label) + "'",
+		"account": None
+	}
+
+	for row in data:
+		if row.get("parent_account"):
+			for period in period_list:
+				total_row.setdefault(period.key, 0.0)
+				total_row[period.key] += row.get(period.key, 0.0)
+
+	out.append(total_row)
+	out.append({})
--- a/erpnext/accounts/report/financial_statements.py
+++ b/erpnext/accounts/report/financial_statements.py
@@ -80,8 +80,13 @@ def get_data(company, root_type, balance_must_be, period_list, ignore_closing_en
 		return None

 	accounts, accounts_by_name = filter_accounts(accounts)
-	gl_entries_by_account = get_gl_entries(company, period_list[0]["from_date"], period_list[-1]["to_date"],
-		accounts[0].lft, accounts[0].rgt, ignore_closing_entries=ignore_closing_entries)
+
+	gl_entries_by_account = {}
+	for root in frappe.db.sql("""select lft, rgt from tabAccount
+			where root_type=%s and ifnull(parent_account, '') = ''""", root_type, as_dict=1):
+		set_gl_entries_by_account(company, period_list[0]["from_date"],
+			period_list[-1]["to_date"],root.lft, root.rgt, gl_entries_by_account,
+			ignore_closing_entries=ignore_closing_entries)

 	calculate_values(accounts_by_name, gl_entries_by_account, period_list)
 	accumulate_values_into_parents(accounts, accounts_by_name, period_list)
@@ -101,7 +106,6 @@ def calculate_values(accounts_by_name, gl_entries_by_account, period_list):
 				if entry.posting_date <= period.to_date:
 					d[period.key] = d.get(period.key, 0.0) + flt(entry.debit) - flt(entry.credit)

-
 def accumulate_values_into_parents(accounts, accounts_by_name, period_list):
 	"""accumulate children's values in parent accounts"""
 	for d in reversed(accounts):
@@ -143,15 +147,20 @@ def prepare_data(accounts, balance_must_be, period_list):
 	return out

 def add_total_row(out, balance_must_be, period_list):
-	row = {
+	total_row = {
 		"account_name": "'" + _("Total ({0})").format(balance_must_be) + "'",
 		"account": None
 	}
-	for period in period_list:
-		row[period.key] = out[0].get(period.key, 0.0)
-		out[0][period.key] = ""

-	out.append(row)
+	for row in out:
+		if not row.get("parent_account"):
+			for period in period_list:
+				total_row.setdefault(period.key, 0.0)
+				total_row[period.key] += row.get(period.key, 0.0)
+
+			row[period.key] = ""
+
+	out.append(total_row)

 	# blank row after Total
 	out.append({})
@@ -200,7 +209,8 @@ def sort_root_accounts(roots):

 	roots.sort(compare_roots)

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

@@ -226,7 +236,6 @@ def get_gl_entries(company, from_date, to_date, root_lft, root_rgt, ignore_closi
 		},
 		as_dict=True)

-	gl_entries_by_account = {}
 	for entry in gl_entries:
 		gl_entries_by_account.setdefault(entry.account, []).append(entry)

@@ -248,4 +257,4 @@ def get_columns(period_list):
 			"width": 150
 		})

-	return columns
+	return columns
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@ -85,7 +85,7 @@ def get_columns(filters):
 		]

 	columns += [
-		_("Voucher Type") + "::120", _("Voucher No") + ":Dynamic Link/Voucher Type:160",
+		_("Voucher Type") + "::120", _("Voucher No") + ":Dynamic Link/"+_("Voucher Type")+":160",
 		_("Against Account") + "::120", _("Party Type") + "::80", _("Party") + "::150",
 		_("Cost Center") + ":Link/Cost Center:100", _("Remarks") + "::400"
 	]
@@ -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}
@@ -178,7 +178,8 @@ def get_data_with_opening_closing(filters, account_details, gl_entries):

 	else:
 		for gl in gl_entries:
-			if gl.posting_date >= getdate(filters.from_date) and gl.posting_date <= getdate(filters.to_date):
+			if gl.posting_date >= getdate(filters.from_date) and gl.posting_date <= getdate(filters.to_date) \
+					and gl.is_opening == "No":
 				data.append(gl)


--- a/erpnext/accounts/report/gross_profit/gross_profit.py
+++ b/erpnext/accounts/report/gross_profit/gross_profit.py
@@ -98,16 +98,17 @@ class GrossProfitGenerator(object):

 			row.base_amount = flt(row.base_net_amount)

+			product_bundles = []
 			if row.update_stock:
 				product_bundles = self.product_bundles.get(row.parenttype, {}).get(row.parent, frappe._dict())
 			elif row.dn_detail:
 				product_bundles = self.product_bundles.get("Delivery Note", {})\
 					.get(row.delivery_note, frappe._dict())
 				row.item_row = row.dn_detail
-			
+
 			# get buying amount
 			if row.item_code in product_bundles:
-				row.buying_amount = self.get_buying_amount_from_product_bundle(row, 
+				row.buying_amount = self.get_buying_amount_from_product_bundle(row,
 					product_bundles[row.item_code])
 			else:
 				row.buying_amount = self.get_buying_amount(row, row.item_code)
@@ -184,7 +185,7 @@ class GrossProfitGenerator(object):
 				parenttype, parent = row.parenttype, row.parent
 				if row.dn_detail:
 					parenttype, parent = "Delivery Note", row.delivery_note
-				
+
 				for i, sle in enumerate(my_sle):
 					# find the stock valution rate from stock ledger entry
 					if sle.voucher_type == parenttype and parent == sle.voucher_no and \
@@ -207,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
@@ -5,7 +5,7 @@ from __future__ import unicode_literals
 import frappe
 from frappe import _
 from frappe.utils import cint, flt, getdate, formatdate, cstr
-from erpnext.accounts.report.financial_statements import filter_accounts, get_gl_entries
+from erpnext.accounts.report.financial_statements import filter_accounts, set_gl_entries_by_account

 value_fields = ("opening_debit", "opening_credit", "debit", "credit", "closing_debit", "closing_credit")

@@ -45,7 +45,7 @@ def validate_filters(filters):
 		filters.to_date = filters.year_end_date

 def get_data(filters):
-	accounts = frappe.db.sql("""select name, parent_account, account_name, root_type, report_type, lft, rgt 
+	accounts = frappe.db.sql("""select name, parent_account, account_name, root_type, report_type, lft, rgt
 		from `tabAccount` where company=%s order by lft""", filters.company, as_dict=True)

 	if not accounts:
@@ -56,8 +56,10 @@ def get_data(filters):
 	min_lft, max_rgt = frappe.db.sql("""select min(lft), max(rgt) from `tabAccount`
 		where company=%s""", (filters.company,))[0]

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

 	opening_balances = get_opening_balances(filters)

@@ -67,27 +69,27 @@ def get_data(filters):
 	data = prepare_data(accounts, filters, total_row)

 	return data
-	
+
 def get_opening_balances(filters):
 	balance_sheet_opening = get_rootwise_opening_balances(filters, "Balance Sheet")
 	pl_opening = get_rootwise_opening_balances(filters, "Profit and Loss")
-	
+
 	balance_sheet_opening.update(pl_opening)
 	return balance_sheet_opening
-	
-	
+
+
 def get_rootwise_opening_balances(filters, report_type):
 	additional_conditions = " and posting_date >= %(year_start_date)s" \
 		if report_type == "Profit and Loss" else ""
-		
+
 	if not flt(filters.with_period_closing_entry):
 		additional_conditions += " and ifnull(voucher_type, '')!='Period Closing Voucher'"
-		
+
 	gle = frappe.db.sql("""
-		select 
-			account, sum(ifnull(debit, 0)) as opening_debit, sum(ifnull(credit, 0)) as opening_credit 
+		select
+			account, sum(debit) as opening_debit, sum(credit) as opening_credit
 		from `tabGL Entry`
-		where 
+		where
 			company=%(company)s
 			{additional_conditions}
 			and (posting_date < %(from_date)s or ifnull(is_opening, 'No') = 'Yes')
@@ -100,11 +102,11 @@ def get_rootwise_opening_balances(filters, report_type):
 			"year_start_date": filters.year_start_date
 		},
 		as_dict=True)
-		
+
 	opening = frappe._dict()
 	for d in gle:
 		opening.setdefault(d.account, d)
-		
+
 	return opening

 def calculate_values(accounts, gl_entries_by_account, opening_balances, filters):
@@ -139,7 +141,7 @@ def calculate_values(accounts, gl_entries_by_account, opening_balances, filters)

 		total_row["debit"] += d["debit"]
 		total_row["credit"] += d["credit"]
-		
+

 	return total_row

--- 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
@@ -134,6 +134,8 @@ def add_ac(args=None):
 	ac.update(args)
 	ac.old_parent = ""
 	ac.freeze_account = "No"
+	if ac.get("is_root"):
+		ac.flags.ignore_mandatory = True
 	ac.insert()

 	return ac.name
@@ -181,7 +183,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)

@@ -211,7 +213,7 @@ def update_against_doc(d, jv_obj):

 	if d['allocated_amt'] < d['unadjusted_amt']:
 		jvd = frappe.db.sql("""
-			select cost_center, balance, against_account, is_advance, 
+			select cost_center, balance, against_account, is_advance,
 				account_type, exchange_rate, account_currency
 			from `tabJournal Entry Account` where name = %s
 		""", d['voucher_detail_no'], as_dict=True)
@@ -282,7 +284,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 +303,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 +374,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 +394,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)""" %
@@ -415,47 +417,63 @@ def get_stock_rbnb_difference(posting_date, company):
 	# Amount should be credited
 	return flt(stock_rbnb) + flt(sys_bal)

-def get_outstanding_invoices(amount_query, account, party_type, party):
-	all_outstanding_vouchers = []
-	outstanding_voucher_list = frappe.db.sql("""
-		select
-			voucher_no, voucher_type, posting_date,
-			ifnull(sum({amount_query}), 0) as invoice_amount
+def get_outstanding_invoices(party_type, party, account, condition=None):
+	outstanding_invoices = []
+	precision = frappe.get_precision("Sales Invoice", "outstanding_amount")
+
+	if party_type=="Customer":
+		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 = "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({payment_dr_or_cr}), 0)
+				from `tabGL Entry` payment_gl_entry
+				where
+					payment_gl_entry.against_voucher_type = invoice_gl_entry.voucher_type
+					and payment_gl_entry.against_voucher = invoice_gl_entry.voucher_no
+					and payment_gl_entry.party_type = invoice_gl_entry.party_type
+					and payment_gl_entry.party = invoice_gl_entry.party
+					and payment_gl_entry.account = invoice_gl_entry.account
+					and {payment_dr_or_cr} > 0
+			) as payment_amount
 		from
-			`tabGL Entry`
+			`tabGL Entry` invoice_gl_entry
 		where
-			account = %s and party_type=%s and party=%s and {amount_query} > 0
-			and (CASE
-					WHEN voucher_type = 'Journal Entry'
-					THEN ifnull(against_voucher, '') = ''
-					ELSE 1=1
-				END)
+			party_type = %(party_type)s
+			and party = %(party)s
+			and account = %(account)s
+			and {dr_or_cr} > 0
+			{condition}
+			and ((voucher_type = 'Journal Entry'
+					and (against_voucher = ''
+						or against_voucher is null))
+				or (voucher_type != 'Journal Entry'))
 		group by voucher_type, voucher_no
-		""".format(amount_query = amount_query), (account, party_type, party), as_dict = True)
+		having (invoice_amount - payment_amount) > 0.005""".format(
+			dr_or_cr = dr_or_cr,
+			payment_dr_or_cr = payment_dr_or_cr,
+			condition = condition or ""
+		), {
+			"party_type": party_type,
+			"party": party,
+			"account": account,
+		}, as_dict=True)

-	for d in outstanding_voucher_list:
-		payment_amount = frappe.db.sql("""
-			select ifnull(sum({amount_query}), 0)
-			from
-				`tabGL Entry`
-			where
-				account = %s and party_type=%s and party=%s and {amount_query} < 0
-				and against_voucher_type = %s and ifnull(against_voucher, '') = %s
-			""".format(**{
-			"amount_query": amount_query
-			}), (account, party_type, party, d.voucher_type, d.voucher_no))
+	for d in invoice_list:
+		outstanding_invoices.append({
+			'voucher_no': d.voucher_no,
+			'voucher_type': d.voucher_type,
+			'posting_date': d.posting_date,
+			'invoice_amount': flt(d.invoice_amount),
+			'payment_amount': flt(d.payment_amount),
+			'outstanding_amount': flt(d.invoice_amount - d.payment_amount, precision)
+		})

-		payment_amount = -1*payment_amount[0][0] if payment_amount else 0
-		precision = frappe.get_precision("Sales Invoice", "outstanding_amount")
-
-		if d.invoice_amount > payment_amount:
-
-			all_outstanding_vouchers.append({
-				'voucher_no': d.voucher_no,
-				'voucher_type': d.voucher_type,
-				'posting_date': d.posting_date,
-				'invoice_amount': flt(d.invoice_amount, precision),
-				'outstanding_amount': flt(d.invoice_amount - payment_amount, precision)
-			})
-
-	return all_outstanding_vouchers
+	return outstanding_invoices
--- a/erpnext/buying/doctype/purchase_common/purchase_common.js
+++ b/erpnext/buying/doctype/purchase_common/purchase_common.js
@@ -58,6 +58,12 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
 	refresh: function(doc) {
 		this.frm.toggle_display("supplier_name",
 			(this.supplier_name && this.frm.doc.supplier_name!==this.frm.doc.supplier));
+
+		if(this.frm.docstatus==0 &&
+			(this.frm.doctype==="Purchase Order" || this.frm.doctype==="Material Request")) {
+			this.set_from_product_bundle();
+		}
+
 		this._super();
 	},

@@ -157,6 +163,13 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
 	},
 	add_deduct_tax: function(doc, cdt, cdn) {
 		this.calculate_taxes_and_totals();
+	},
+
+	set_from_product_bundle: function() {
+		var me = this;
+		this.frm.add_custom_button(__("From Product Bundle"), function() {
+			erpnext.buying.get_items_from_product_bundle(me.frm);
+		});
 	}
 });

@@ -180,3 +193,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,24 +18,49 @@ 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;

-		if(doc.docstatus == 1 && !in_list(["Stopped", "Closed", "Delivered"], doc.status)) {
-
-			if(flt(doc.per_billed, 2) < 100 || doc.per_received < 100) {
-				cur_frm.add_custom_button(__('Stop'), this.stop_purchase_order);
+		for (var i in cur_frm.doc.items) {
+			var item = cur_frm.doc.items[i];
+			if(item.delivered_by_supplier !== 1) {
+				allow_receipt = true;
 			}

-			cur_frm.add_custom_button(__('Close'), this.close_purchase_order);
+			else {
+				is_drop_ship = true
+			}

-			if(doc.delivered_by_supplier && doc.status!="Delivered"){
-				cur_frm.add_custom_button(__('Mark as Delivered'), this.delivered_by_supplier);
+			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);
+				}
+
+				cur_frm.add_custom_button(__('Close'), this.close_purchase_order);
 			}

 			if(flt(doc.per_billed)==0) {
 				cur_frm.add_custom_button(__('Payment'), cur_frm.cscript.make_bank_entry);
 			}

-			if(flt(doc.per_received, 2) < 100) {
+			if(is_drop_ship && doc.status!="Delivered"){
+				cur_frm.add_custom_button(__('Mark as Delivered'),
+					 this.delivered_by_supplier).addClass("btn-primary");
+			}
+		} 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 && allow_receipt) {
 				cur_frm.add_custom_button(__('Receive'), this.make_purchase_receipt).addClass("btn-primary");

 				if(doc.is_subcontracted==="Yes") {
@@ -45,15 +70,14 @@ 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).addClass("btn-primary");
 		}

 		if(doc.docstatus == 1 && in_list(["Stopped", "Closed", "Delivered"], doc.status)) {
-			cur_frm.add_custom_button(__('Re-open'), this.unstop_purchase_order);
+			if (this.frm.has_perm("submit")) {
+				cur_frm.add_custom_button(__('Re-open'), this.unstop_purchase_order).addClass("btn-primary");
+			}
 		}
 	},

@@ -165,15 +189,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')
 	}
@@ -225,14 +253,6 @@ cur_frm.fields_dict['items'].grid.get_field('bom').get_query = function(doc, cdt
 	}
 }

-cur_frm.cscript.get_last_purchase_rate = function(doc, cdt, cdn){
-	return $c_obj(doc, 'get_last_purchase_rate', '', function(r, rt) {
-		refresh_field("items");
-		var doc = locals[cdt][cdn];
-		cur_frm.cscript.calc_amount( doc, 2);
-	});
-}
-
 cur_frm.pformat.indent_no = function(doc, cdt, cdn){
 	//function to make row of table

--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
--- a/erpnext/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py
@@ -8,7 +8,6 @@ from frappe.utils import cstr, flt
 from frappe import msgprint, _, throw
 from frappe.model.mapper import get_mapped_doc
 from erpnext.controllers.buying_controller import BuyingController
-from erpnext.stock.doctype.item.item import get_last_purchase_details
 from erpnext.stock.stock_balance import update_bin_qty, get_ordered_qty
 from frappe.desk.notifications import clear_doctype_notifications

@@ -48,6 +47,7 @@ class PurchaseOrder(BuyingController):
 		self.validate_for_subcontracting()
 		self.validate_minimum_order_qty()
 		self.create_raw_materials_supplied("supplied_items")
+		self.set_received_qty_for_drop_ship_items()

 	def validate_with_previous_doc(self):
 		super(PurchaseOrder, self).validate_with_previous_doc({
@@ -84,29 +84,6 @@ class PurchaseOrder(BuyingController):
 				d.schedule_date = frappe.db.get_value("Material Request Item",
 						d.prevdoc_detail_docname, "schedule_date")

-	def get_last_purchase_rate(self):
-		"""get last purchase rates for all items"""
-		conversion_rate = flt(self.get('conversion_rate')) or 1.0
-
-		for d in self.get("items"):
-			if d.item_code:
-				last_purchase_details = get_last_purchase_details(d.item_code, self.name)
-
-				if last_purchase_details:
-					d.base_price_list_rate = last_purchase_details['base_price_list_rate'] * (flt(d.conversion_factor) or 1.0)
-					d.discount_percentage = last_purchase_details['discount_percentage']
-					d.base_rate = last_purchase_details['base_rate'] * (flt(d.conversion_factor) or 1.0)
-					d.price_list_rate = d.base_price_list_rate / conversion_rate
-					d.rate = d.base_rate / conversion_rate
-				else:
-					# if no last purchase found, reset all values to 0
-					d.base_price_list_rate = d.base_rate = d.price_list_rate = d.rate = d.discount_percentage = 0
-
-					item_last_purchase_rate = frappe.db.get_value("Item", d.item_code, "last_purchase_rate")
-					if item_last_purchase_rate:
-						d.base_price_list_rate = d.base_rate = d.price_list_rate \
-							= d.rate = item_last_purchase_rate
-
 	# Check for Stopped status
 	def check_for_stopped_or_closed_status(self, pc_obj):
 		check_list =[]
@@ -134,9 +111,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, {
@@ -161,7 +140,7 @@ 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()
@@ -178,8 +157,9 @@ 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()
+			self.update_delivered_qty_in_sales_order()

 		pc_obj = frappe.get_doc('Purchase Common')
 		self.check_for_stopped_or_closed_status(pc_obj)
@@ -231,16 +211,30 @@ 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)

 		for so_name in sales_orders_to_update:
 			so = frappe.get_doc("Sales Order", so_name)
-			so.update_delivery_status(self.name)
+			so.update_delivery_status()
 			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_for_drop_ship_items(self):
+		for item in self.items:
+			if item.delivered_by_supplier == 1:
+				item.received_qty = item.qty
+
@frappe.whitelist()
 def stop_or_unstop_purchase_orders(names, status):
 	if not frappe.has_permission("Purchase Order", "write"):
@@ -259,7 +253,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")
@@ -289,7 +282,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: abs(doc.received_qty) < abs(doc.qty) and doc.delivered_by_supplier!=1
 		},
 		"Purchase Taxes and Charges": {
 			"doctype": "Purchase Taxes and Charges",
@@ -325,7 +318,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 abs(doc.billed_amt) < abs(doc.amount))
 		},
 		"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,11 +21,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-user", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -43,13 +45,15 @@
   "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", 
   "options": "SUPP-", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -68,11 +72,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Supplier Name", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "supplier_name", 
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -90,9 +96,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, 
@@ -112,12 +120,14 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Supplier Type", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "supplier_type", 
   "oldfieldtype": "Link", 
   "options": "Supplier Type", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -136,10 +146,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Is Frozen", 
+   "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, 
@@ -157,10 +169,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, 
@@ -179,10 +193,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Billing Currency", 
+   "length": 0, 
   "no_copy": 1, 
   "options": "Currency", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -201,53 +217,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Price List", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Price List", 
   "permlevel": 0, 
   "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, 
-   "collapsible": 0, 
-   "fieldname": "column_break_10", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 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, 
-   "collapsible": 0, 
-   "fieldname": "default_taxes_and_charges", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Taxes and Charges", 
-   "no_copy": 0, 
-   "options": "Purchase Taxes and Charges Template", 
-   "permlevel": 0, 
-   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -266,9 +241,11 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Credit Days", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -288,11 +265,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Address and Contacts", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Column Break", 
   "options": "icon-map-marker", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -311,9 +290,11 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Address HTML", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -331,9 +312,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, 
@@ -353,9 +336,11 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Contact HTML", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -375,9 +360,11 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Default Payable Accounts", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -398,10 +385,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Accounts", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Party Account", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -421,9 +410,11 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Supplier Details", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -443,11 +434,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Website", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "website", 
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -467,11 +460,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Supplier Details", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "supplier_details", 
   "oldfieldtype": "Code", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -490,10 +485,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Communications", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Communication", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -511,7 +508,8 @@
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2015-10-02 07:39:14.767820", 
+ "max_attachments": 0, 
+ "modified": "2015-12-08 12:52:56.827461", 
 "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,10 +20,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "icon-user", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -43,10 +45,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Title", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 1, 
   "reqd": 0, 
@@ -64,13 +68,15 @@
   "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", 
   "options": "SQTN-", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -90,12 +96,14 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Supplier", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "supplier", 
   "oldfieldtype": "Link", 
   "options": "Supplier", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -114,9 +122,11 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Name", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -135,9 +145,11 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Address", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -156,9 +168,11 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Contact", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -177,9 +191,11 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Mobile No", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -198,9 +214,11 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Contact Email", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -218,10 +236,12 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "print_width": "50%", 
   "read_only": 0, 
   "report_hide": 0, 
@@ -242,11 +262,13 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Date", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "transaction_date", 
   "oldfieldtype": "Date", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -265,12 +287,14 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Amended From", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "amended_from", 
   "oldfieldtype": "Data", 
   "options": "Supplier Quotation", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -290,12 +314,14 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Company", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "company", 
   "oldfieldtype": "Link", 
   "options": "Company", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -314,10 +340,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Currency and Price List", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "icon-tag", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -336,12 +364,14 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Currency", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "currency", 
   "oldfieldtype": "Select", 
   "options": "Currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -361,12 +391,14 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Exchange Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "conversion_rate", 
   "oldfieldtype": "Currency", 
   "permlevel": 0, 
   "precision": "9", 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -384,9 +416,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, 
   "print_width": "50%", 
   "read_only": 0, 
   "report_hide": 0, 
@@ -407,10 +441,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Price List", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Price List", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -430,10 +466,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Price List Currency", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -453,10 +491,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Price List Exchange Rate", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "9", 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -475,9 +515,11 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Ignore Pricing Rule", 
+   "length": 0, 
   "no_copy": 1, 
   "permlevel": 1, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -496,11 +538,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-shopping-cart", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -519,12 +563,14 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Items", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "po_details", 
   "oldfieldtype": "Table", 
   "options": "Supplier Quotation Item", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -542,9 +588,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, 
@@ -563,11 +611,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -586,12 +636,14 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Net Total (Company Currency)", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "net_total", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -609,9 +661,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, 
@@ -630,11 +684,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "currency", 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -653,12 +709,14 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Net Total", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "net_total_import", 
   "oldfieldtype": "Currency", 
   "options": "currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -677,11 +735,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Taxes and Charges", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-money", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -701,12 +761,14 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Taxes and Charges", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "purchase_other_charges", 
   "oldfieldtype": "Link", 
   "options": "Purchase Taxes and Charges Template", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -725,12 +787,14 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Purchase Taxes and Charges", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "purchase_tax_details", 
   "oldfieldtype": "Table", 
   "options": "Purchase Taxes and Charges", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -749,10 +813,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Taxes and Charges Calculation", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldtype": "HTML", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -771,11 +837,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-money", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -794,12 +862,14 @@
   "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", 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -818,12 +888,14 @@
   "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", 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -842,12 +914,14 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total Taxes and Charges (Company Currency)", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "total_tax", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -865,10 +939,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, 
@@ -887,12 +963,14 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Taxes and Charges Added", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "other_charges_added_import", 
   "oldfieldtype": "Currency", 
   "options": "currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -911,12 +989,14 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Taxes and Charges Deducted", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "other_charges_deducted_import", 
   "oldfieldtype": "Currency", 
   "options": "currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -935,11 +1015,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total Taxes and Charges", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "currency", 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -959,10 +1041,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Additional Discount", 
+   "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, 
@@ -981,56 +1065,14 @@
   "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, 
   "precision": "", 
   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break_43", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 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, 
-   "collapsible": 0, 
-   "fieldname": "discount_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Additional Discount Amount", 
-   "no_copy": 0, 
-   "options": "currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1049,11 +1091,13 @@
   "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, 
   "precision": "", 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1061,6 +1105,78 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break_43", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "additional_discount_percentage", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Additional Discount Percentage", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "discount_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Additional Discount Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
  {
   "allow_on_submit": 0, 
   "bold": 0, 
@@ -1071,10 +1187,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, 
@@ -1093,12 +1211,14 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Grand Total (Company Currency)", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "grand_total", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1118,11 +1238,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "In Words (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "in_words", 
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1141,12 +1263,14 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Rounded Total (Company Currency)", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "rounded_total", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1164,10 +1288,12 @@
   "ignore_user_permissions": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1186,12 +1312,14 @@
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Grand Total", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "grand_total_import", 
   "oldfieldtype": "Currency", 
   "options": "currency", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1210,11 +1338,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "In Words", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "in_words_import", 
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1234,11 +1364,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Terms and Conditions", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-legal", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1257,12 +1389,14 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Terms", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "tc_name", 
   "oldfieldtype": "Link", 
   "options": "Terms and Conditions", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1281,11 +1415,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Terms and Conditions", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "terms", 
   "oldfieldtype": "Text Editor", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1305,10 +1441,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Contact Details", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "icon-bullhorn", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1327,10 +1465,12 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Supplier Address", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Address", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1349,10 +1489,12 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Contact Person", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Contact", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1371,10 +1513,12 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Printing Settings", 
+   "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, 
@@ -1393,12 +1537,14 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Print Heading", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "select_print_heading", 
   "oldfieldtype": "Link", 
   "options": "Print Heading", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 1, 
   "reqd": 0, 
@@ -1417,12 +1563,14 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Letter Head", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "letter_head", 
   "oldfieldtype": "Select", 
   "options": "Letter Head", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1441,11 +1589,13 @@
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "More Information", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Section Break", 
   "options": "icon-file-text", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1463,13 +1613,15 @@
   "ignore_user_permissions": 0, 
   "in_filter": 1, 
   "in_list_view": 0, 
-   "label": "Status",  
+   "label": "Status", 
+   "length": 0, 
   "no_copy": 1, 
   "oldfieldname": "status", 
   "oldfieldtype": "Select", 
   "options": "\nDraft\nSubmitted\nStopped\nCancelled", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -1488,11 +1640,13 @@
   "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, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1510,9 +1664,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, 
@@ -1531,12 +1687,14 @@
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Fiscal Year", 
+   "length": 0, 
   "no_copy": 0, 
   "oldfieldname": "fiscal_year", 
   "oldfieldtype": "Select", 
   "options": "Fiscal Year", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -1554,7 +1712,9 @@
 "is_submittable": 1, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2015-10-02 07:39:15.027459", 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2015-12-17 16:18:29.855942", 
 "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/buying/print_format/drop_shipping/drop_shipping.json
+++ b/erpnext/buying/print_format/drop_shipping/drop_shipping.json
@@ -1,17 +0,0 @@
-{
- "creation": "2015-10-20 16:46:39.382799", 
- "custom_format": 0, 
- "disabled": 0, 
- "doc_type": "Purchase Order", 
- "docstatus": 0, 
- "doctype": "Print Format", 
- "font": "Default", 
- "format_data": "[{\"fieldname\": \"print_heading_template\", \"fieldtype\": \"HTML\", \"options\": \"<h1 style=\\\"text-align: center;\\\">Purchase Order</h1><div style=\\\"text-align: center;\\\">{{doc.name}}</div><div style=\\\"text-align: center;\\\"><hr></div>\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"title\"}, {\"print_hide\": 0, \"fieldname\": \"supplier\"}, {\"print_hide\": 0, \"fieldname\": \"supplier_name\"}, {\"print_hide\": 0, \"fieldname\": \"address_display\"}, {\"print_hide\": 0, \"fieldname\": \"contact_display\"}, {\"print_hide\": 0, \"fieldname\": \"contact_mobile\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"transaction_date\"}, {\"print_hide\": 0, \"fieldname\": \"customer\"}, {\"print_hide\": 0, \"fieldname\": \"customer_name\"}, {\"print_hide\": 0, \"fieldname\": \"customer_address_display\"}, {\"print_hide\": 0, \"fieldname\": \"customer_contact_display\"}, {\"print_hide\": 0, \"fieldname\": \"customer_contact_mobile\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"visible_columns\": [{\"print_hide\": 0, \"fieldname\": \"item_code\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"description\", \"print_width\": \"300px\"}, {\"print_hide\": 0, \"fieldname\": \"image\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"qty\", \"print_width\": \"60px\"}, {\"print_hide\": 0, \"fieldname\": \"uom\", \"print_width\": \"100px\"}, {\"print_hide\": 0, \"fieldname\": \"discount_percentage\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"rate\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"pricing_rule\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"supplier_quotation\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"supplier_quotation_item\", \"print_width\": \"\"}], \"print_hide\": 0, \"fieldname\": \"items\"}, {\"print_hide\": 0, \"fieldname\": \"get_last_purchase_rate\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"total\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"visible_columns\": [{\"print_hide\": 0, \"fieldname\": \"category\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"add_deduct_tax\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"charge_type\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"row_id\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"included_in_print_rate\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"account_head\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"cost_center\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"description\", \"print_width\": \"300px\"}, {\"print_hide\": 0, \"fieldname\": \"rate\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"tax_amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"total\", \"print_width\": \"\"}], \"print_hide\": 0, \"fieldname\": \"taxes\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"grand_total\"}, {\"print_hide\": 0, \"fieldname\": \"in_words\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"terms\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"customer_contact_person\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"recurring_print_format\"}]", 
- "modified": "2015-10-20 17:21:45.810640", 
- "modified_by": "saurabh@erpnext.com", 
- "name": "Drop Shipping", 
- "owner": "Administrator", 
- "print_format_builder": 1, 
- "print_format_type": "Server", 
- "standard": "No"
-}
--- a/erpnext/buying/print_format/drop_shipping_format/init.py
+++ b/erpnext/buying/print_format/drop_shipping_format/init.py
--- a/erpnext/buying/print_format/drop_shipping_format/drop_shipping_format.json
+++ b/erpnext/buying/print_format/drop_shipping_format/drop_shipping_format.json
--- a/Show More
+++ b/Show More