Merge branch 'hotfix'

erpnext/__init__.py

@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe
 
-__version__ = '7.0.62'
+__version__ = '7.0.63'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

erpnext/accounts/doctype/pricing_rule/pricing_rule.py

@@ -165,6 +165,13 @@ def get_pricing_rule_for_item(args):
 			})
 		else:
 			item_details.discount_percentage = pricing_rule.discount_percentage
+	elif args.get('pricing_rule'):
+		if frappe.db.get_value('Pricing Rule', args.get('pricing_rule'), 'price_or_discount') == 'Discount Percentage':
+			item_details.discount_percentage = 0.0
+
+		item_details.margin_rate_or_amount = 0.0
+		item_details.margin_type = None
+
 	return item_details
 
 def get_pricing_rules(args):

erpnext/patches/v7_0/rename_salary_components.py

@@ -78,9 +78,12 @@ def execute():
 	
 	for doctype, cols in dt_cols_de.items():		
 		source_cols = "`" + "`, `".join(standard_cols_de + cols) + "`"
-		
-		frappe.db.sql("""INSERT INTO `tabSalary Component` ({0}) SELECT {1} FROM `tab{2}`"""
-			.format(target_cols, source_cols, doctype))
+		try:
+			frappe.db.sql("""INSERT INTO `tabSalary Component` ({0}) SELECT {1} FROM `tab{2}`"""
+				.format(target_cols, source_cols, doctype))
+		except Exception, e:
+			if e.args[0]==1062:
+				pass
 			
 	update_customizations()
 			

erpnext/public/js/controllers/taxes_and_totals.js

@@ -15,10 +15,6 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
 
 	},
 	apply_pricing_rule_on_item: function(item){
-		if(!item.margin_type){
-			item.margin_rate_or_amount = 0.0;
-		}
-
 		if(item.margin_type == "Percentage"){
 			item.total_margin = item.price_list_rate + item.price_list_rate * ( item.margin_rate_or_amount / 100);
 		}else{

erpnext/public/js/controllers/transaction.js

@@ -720,7 +720,8 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 					"brand": d.brand,
 					"qty": d.qty,
 					"parenttype": d.parenttype,
-					"parent": d.parent
+					"parent": d.parent,
+					"pricing_rule": d.pricing_rule
 				});
 
 				// if doctype is Quotation Item / Sales Order Iten then add Margin Type and rate in item_list