Merge branch 'develop'

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.3.1'
+__version__ = '6.3.2'

erpnext/accounts/doctype/tax_rule/tax_rule.json

@@ -580,7 +580,7 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-09-15 12:29:34.435839", 
+ "modified": "2015-09-24 07:59:06.502058", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Tax Rule", 
@@ -601,7 +601,7 @@
    "print": 1, 
    "read": 1, 
    "report": 1, 
-   "role": "Administrator", 
+   "role": "Accounts Manager", 
    "set_user_permissions": 0, 
    "share": 1, 
    "submit": 0, 

erpnext/accounts/doctype/tax_rule/test_tax_rule.py

@@ -13,16 +13,6 @@ class TestTaxRule(unittest.TestCase):
 	def setUp(self):
 		frappe.db.sql("delete from `tabTax Rule` where use_for_shopping_cart <> 1")
 
-	def test_customer_group(self):
-		tax_rule = make_tax_rule(customer= "_Test Customer", customer_group= "_Test Customer Group 1",
-			sales_tax_template = "_Test Sales Taxes and Charges Template")
-		self.assertRaises(IncorrectCustomerGroup, tax_rule.save)
-		
-	def test_supplier_type(self):
-		tax_rule = make_tax_rule(tax_type= "Purchase", supplier= "_Test Supplier", supplier_type= "_Test Supplier Type 1",
-			purchase_tax_template = "_Test Purchase Taxes and Charges Template")
-		self.assertRaises(IncorrectSupplierType, tax_rule.save)
-		
 	def test_conflict(self):
 		tax_rule1 = make_tax_rule(customer= "_Test Customer",
 			sales_tax_template = "_Test Sales Taxes and Charges Template", priority = 1)
@@ -138,4 +128,3 @@ def make_tax_rule(**args):
 		tax_rule.insert()
 
 	return tax_rule
-	

erpnext/hooks.py

@@ -29,7 +29,7 @@ blogs.
 """
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "6.3.1"
+app_version = "6.3.2"
 github_link = "https://github.com/frappe/erpnext"
 
 error_report_email = "support@erpnext.com"

erpnext/patches/v6_2/fix_missing_default_taxes_and_lead.py

@@ -2,6 +2,11 @@ from __future__ import unicode_literals
 import frappe
 
 def execute():
+	# remove missing lead
+	for customer in frappe.db.sql_list("""select name from `tabCustomer`
+		where ifnull(lead_name, '')!='' and not exists (select name from `tabLead` where name=`tabCustomer`.lead_name)"""):
+		frappe.db.set_value("Customer", customer, "lead_name", None)
+
 	# remove missing default taxes
 	for customer in frappe.db.sql_list("""select name from `tabCustomer`
 		where ifnull(default_taxes_and_charges, '')!='' and not exists (
@@ -18,8 +23,3 @@ def execute():
 		c = frappe.get_doc("Supplier", supplier)
 		c.default_taxes_and_charges = None
 		c.save()
-
-	# remove missing lead
-	for customer in frappe.db.sql_list("""select name from `tabCustomer`
-		where ifnull(lead_name, '')!='' and not exists (select name from `tabLead` where name=`tabCustomer`.lead_name)"""):
-		frappe.db.set_value("Customer", customer, "lead_name", None)

erpnext/patches/v6_3/convert_applicable_territory.py

@@ -5,6 +5,7 @@ def execute():
 	frappe.reload_doc("accounts", "doctype", "shipping_rule_country")
 	frappe.reload_doctype("Price List")
 	frappe.reload_doctype("Shipping Rule")
+	frappe.reload_doctype("Shopping Cart Settings")
 
 	# for price list
 	countries = frappe.db.sql_list("select name from tabCountry")

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = "6.3.1"
+version = "6.3.2"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()