Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17059 from rohitwaghchaure/cherry_pick_test_case_fix

Browse Source 
fix: cherry-pick item variant test cases fix
This commit is contained in:
rohitwaghchaure 2019-03-29 19:32:30 +05:30 committed by GitHub
commit 8dadd4b0b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/setup/doctype/brand/test_records.json
View File

@ -1,6 +1,6 @@
[ [
{ {
"brand": "_Test Brand", "brand": "_Test Brand",
"doctype": "Brand" "doctype": "Brand"
} }
] ]

5
erpnext/stock/doctype/item/item.py
View File

@ -758,6 +758,9 @@ class Item(WebsiteGenerator):
d.conversion_factor = value d.conversion_factor = value
def validate_attributes(self): def validate_attributes(self):
if not self.variant_based_on:
self.variant_based_on = 'Item Attribute'
if (self.has_variants or self.variant_of) and self.variant_based_on == 'Item Attribute': if (self.has_variants or self.variant_of) and self.variant_based_on == 'Item Attribute':
attributes = [] attributes = []
if not self.attributes: if not self.attributes:
@ -780,7 +783,7 @@ class Item(WebsiteGenerator):
variant = get_variant(self.variant_of, args, self.name) variant = get_variant(self.variant_of, args, self.name)
if variant: if variant:
frappe.throw(_("Item variant {0} exists with same attributes") frappe.throw(_("Item variant {0} exists with same attributes")
.format(variant), ItemVariantExistsError) .format(variant), ItemVariantExistsError)
validate_item_variant_attributes(self, args) validate_item_variant_attributes(self, args)

2
erpnext/stock/doctype/item/test_item.py
View File

@ -17,7 +17,7 @@ from erpnext.stock.get_item_details import get_item_details
from six import iteritems from six import iteritems
test_ignore = ["BOM"] test_ignore = ["BOM"]
test_dependencies = ["Warehouse", "Item Group"] test_dependencies = ["Warehouse", "Item Group", "Brand"]
def make_item(item_code, properties=None): def make_item(item_code, properties=None):
if frappe.db.exists("Item", item_code): if frappe.db.exists("Item", item_code):