Merge branch 'master' into develop

2018-05-02 14:48:10 +05:30
parent cd00f8f458 0272fc05bf
commit e85a43c1c6
15 changed files with 92 additions and 38 deletions
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -29,6 +29,7 @@ class calculate_taxes_and_totals(object):
 			self.set_item_wise_tax_breakup()

 	def _calculate(self):
+		self.validate_conversion_rate()
 		self.calculate_item_values()
 		self.initialize_taxes()
 		self.determine_exclusive_rate()