nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' into develop

Browse Source
This commit is contained in:
Frappe Bot
2019-01-23 08:19:00 +00:00
parent c4bda9fac3 f74e28bc64
commit e415cce1a9
35 changed files with 570 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/controllers/item_variant.py
View File

@@ -260,8 +260,6 @@ def generate_keyed_value_combinations(args):
return results
def copy_attributes_to_variant(item, variant):
from frappe.model import no_value_fields
# copy non no-copy fields
exclude_fields = ["naming_series", "item_code", "item_name", "show_in_website",