Merge branch 'develop' into fix-profit-and-loss-statement

erpnext/patches/v12_0/set_gst_category.py

@@ -7,6 +7,8 @@ def execute():
 	if not company:
 		return
 
+	frappe.reload_doc('accounts', 'doctype', 'Tax Category')
+
 	make_custom_fields()
 
 	for doctype in ['Sales Invoice', 'Purchase Invoice']:

erpnext/setup/doctype/company/company.py

@@ -14,6 +14,7 @@ from frappe.model.document import Document
 from frappe.contacts.address_and_contact import load_address_and_contact
 from frappe.utils.nestedset import NestedSet
 
+from past.builtins import cmp
 import functools
 
 class Company(NestedSet):