Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into e-commerce-refactor

2021-08-24 11:48:13 +05:30
parent 71b0e0a146 352157c9fc
commit 280f615ded
1294 changed files with 3267 additions and 2749 deletions
--- a/erpnext/controllers/item_variant.py
+++ b/erpnext/controllers/item_variant.py
@@ -343,4 +343,3 @@ def create_variant_doc_for_quick_entry(template, args):
 			variant.name = variant.item_code
 			validate_item_variant_attributes(variant, args)
 	return variant.as_dict()
-