Merge branch 'hotfix'

make quotation against lead company name (#9188)

erpnext/__init__.py

@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe
 
-__version__ = '8.0.49'
+__version__ = '8.0.51'
 
 
 def get_default_company(user=None):

erpnext/crm/doctype/lead/lead.py

@@ -150,8 +150,7 @@ def make_quotation(source_name, target_doc=None):
 		{"Lead": {
 			"doctype": "Quotation",
 			"field_map": {
-				"name": "lead",
-				"lead_name": "customer_name",
+				"name": "lead"
 			}
 		}}, target_doc)
 	target_doc.quotation_to = "Lead"

erpnext/patches.txt

@@ -400,3 +400,5 @@ erpnext.patches.v8_0.delete_schools_depricated_doctypes
 erpnext.patches.v8_0.update_customer_pos_id
 erpnext.patches.v8_0.rename_items_in_status_field_of_material_request
 erpnext.patches.v8_0.delete_bin_indexes
+erpnext.patches.v8_0.update_sales_cost_in_project
+erpnext.patches.v8_0.change_in_words_varchar_length

erpnext/patches/v8_0/change_in_words_varchar_length.py

@@ -0,0 +1,16 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	doctypes = frappe.db.sql_list("""select parent from tabDocField where fieldname = 'in_words'""")
+		
+	for dt in doctypes:
+		for fieldname in ("in_words", "base_in_words"):
+			frappe.db.sql("alter table `tab{0}` change column `{1}` `{2}` varchar(255)"
+				.format(dt, fieldname, fieldname))
+				
+	frappe.db.sql("""alter table `tabJournal Entry` 
+		change column `total_amount_in_words` `total_amount_in_words` varchar(255)""")

erpnext/patches/v8_0/update_sales_cost_in_project.py

@@ -0,0 +1,12 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	frappe.db.sql("""
+		update `tabProject` p
+		set total_sales_cost = (select sum(base_grand_total) 
+			from `tabSales Order` where project=p.name and docstatus=1)
+	""")

erpnext/projects/doctype/project/project.py

@@ -178,7 +178,7 @@ class Project(Document):
 		self.total_purchase_cost = total_purchase_cost and total_purchase_cost[0][0] or 0
 		
 	def update_sales_costing(self):
-		total_sales_cost = frappe.db.sql("""select sum(grand_total)
+		total_sales_cost = frappe.db.sql("""select sum(base_grand_total)
 			from `tabSales Order` where project = %s and docstatus=1""", self.name)
 
 		self.total_sales_cost = total_sales_cost and total_sales_cost[0][0] or 0

erpnext/stock/doctype/item/item.py

@@ -37,7 +37,8 @@ class Item(WebsiteGenerator):
 		if frappe.db.get_default("item_naming_by")=="Naming Series":
 			if self.variant_of:
 				if not self.item_code:
-					self.item_code = make_variant_item_code(self.variant_of, self)
+					template_item_name = frappe.db.get_value("Item", self.variant_of, "item_name")
+					self.item_code = make_variant_item_code(self.variant_of, template_item_name, self)
 			else:
 				from frappe.model.naming import make_autoname
 				self.item_code = make_autoname(self.naming_series+'.#####')

erpnext/stock/utils.py

@@ -65,7 +65,7 @@ def get_stock_balance(item_code, warehouse, posting_date=None, posting_time=None
 	if with_valuation_rate:
 		return (last_entry.qty_after_transaction, last_entry.valuation_rate) if last_entry else (0.0, 0.0)
 	else:
-		return last_entry.qty_after_transaction or 0.0
+		return last_entry.qty_after_transaction if last_entry else 0.0
 
 def get_latest_stock_balance():
 	bin_map = {}