Merge branch 'parsimony-production' into fix-stripe-price-id

.travis.yml

@@ -40,8 +40,7 @@ install:
   - cd ~
   - nvm install 10
 
-  - git clone https://github.com/frappe/bench --depth 1
-  - pip install -e ./bench
+  - pip install -U frappe-bench --only-binary='all'
 
   - git clone https://github.com/ParsimonyGit/frappe --branch $TRAVIS_BRANCH --depth 1
   - bench init --skip-assets --frappe-path ~/frappe --python $(which python) frappe-bench

erpnext/__init__.py

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

erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -29,7 +29,11 @@ def validate(self):
 		self.validate_entries_for_advance()
 		self.validate_multi_currency()
 		self.set_amounts_in_company_currency()
-		self.validate_total_debit_and_credit()
+
+		# Do not validate while importing via data import
+		if not frappe.flags.in_import:
+			self.validate_total_debit_and_credit()
+
 		self.validate_against_jv()
 		self.validate_reference_doc()
 		self.set_against_account()