Merge branch 'master' into develop

This commit is contained in:
Rushabh Mehta
2017-09-29 16:22:02 +05:30
5 changed files with 14 additions and 10 deletions

View File

@@ -207,7 +207,7 @@ def copy_attributes_to_variant(item, variant):
if variant.attributes:
variant.description += "\n"
for d in variant.attributes:
variant.description += "<p>" + d.attribute + ": " + cstr(d.attribute_value) + "</p>"
variant.description += "<div>" + d.attribute + ": " + cstr(d.attribute_value) + "</div>"
def make_variant_item_code(template_item_code, template_item_name, variant):
"""Uses template's item code and abbreviations to make variant's item code"""