Merge branch 'hotfix' into ewb

erpnext/__init__.py

@@ -5,7 +5,7 @@ import frappe
 from erpnext.hooks import regional_overrides
 from frappe.utils import getdate
 
-__version__ = '11.1.22'
+__version__ = '11.1.23'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

erpnext/projects/doctype/project/project.py

@@ -74,7 +74,7 @@ class Project(Document):
 		self.load_tasks()
 		self.validate_dates()
 		self.send_welcome_email()
-		self.update_percent_complete()
+		self.update_percent_complete(from_validate=True)
 
 	def validate_project_name(self):
 		if self.get("__islocal") and frappe.db.exists("Project", self.project_name):
@@ -198,7 +198,7 @@ class Project(Document):
 		if self.sales_order:
 			frappe.db.set_value("Sales Order", self.sales_order, "project", self.name)
 
-	def update_percent_complete(self):
+	def update_percent_complete(self, from_validate=False):
 		if not self.tasks: return
 		total = frappe.db.sql("""select count(name) from tabTask where project=%s""", self.name)[0][0]
 		if not total and self.percent_complete:
@@ -227,7 +227,9 @@ class Project(Document):
 			self.status = "Completed"
 		elif not self.status == "Cancelled":
 			self.status = "Open"
-		self.db_update()
+
+		if not from_validate:
+			self.db_update()
 
 	def update_costing(self):
 		from_time_sheet = frappe.db.sql("""select

erpnext/selling/doctype/sales_order/sales_order.py

@@ -544,7 +544,7 @@ def make_project(source_name, target_doc=None):
 		"Sales Order Item": {
 			"doctype": "Project Task",
 			"field_map": {
-				"description": "title",
+				"item_code": "title",
 			},
 		}
 	}, target_doc, postprocess)