From fed431f9085c8bb1725a7a7387f9dde64fe5d94b Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Mon, 1 Jun 2015 17:05:37 +0530 Subject: [PATCH] Code Fixes in Manage Variants --- .../doctype/manage_variants/manage_variants.js | 7 +------ .../doctype/manage_variants/manage_variants.py | 14 +++++++------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/erpnext/stock/doctype/manage_variants/manage_variants.js b/erpnext/stock/doctype/manage_variants/manage_variants.js index 5388cc2a92..9e6fff78b8 100644 --- a/erpnext/stock/doctype/manage_variants/manage_variants.js +++ b/erpnext/stock/doctype/manage_variants/manage_variants.js @@ -27,12 +27,7 @@ frappe.ui.form.on("Manage Variants", { select: function(event, ui) { field.$input.val(ui.item.value); field.$input.trigger("change"); - }, - focus: function( event, ui ) { - if(ui.manage_variants.action) { - return false; - } - }, + } }); } }, diff --git a/erpnext/stock/doctype/manage_variants/manage_variants.py b/erpnext/stock/doctype/manage_variants/manage_variants.py index 834b9ef9d9..913c2d8136 100644 --- a/erpnext/stock/doctype/manage_variants/manage_variants.py +++ b/erpnext/stock/doctype/manage_variants/manage_variants.py @@ -125,7 +125,7 @@ class ManageVariants(Document): def sync_variants(self): variant_item_codes = [] item_variants_attributes = {} - inserted, updated, renamed_old, renamed_new, deleted = [], [], [], [], [] + inserted, updated, old_variant_name, new_variant_name, deleted = [], [], [], [], [] for v in self.variants: variant_item_codes.append(v.variant) @@ -146,16 +146,16 @@ class ManageVariants(Document): if sorted(json.loads(variant.attributes) ,key=lambda x: x[0]) == \ sorted(att ,key=lambda x: x[0]): rename_variant(existing_variant, variant.variant) - renamed_old.append(existing_variant) - renamed_new.append(variant.variant) + old_variant_name.append(existing_variant) + new_variant_name.append(variant.variant) - if existing_variant not in renamed_old: + if existing_variant not in old_variant_name: delete_variant(existing_variant) deleted.append(existing_variant) for item_code in variant_item_codes: if item_code not in existing_variants: - if item_code not in renamed_new: + if item_code not in new_variant_name: make_variant(self.item, item_code, self.variants) inserted.append(item_code) else: @@ -168,8 +168,8 @@ class ManageVariants(Document): if updated: frappe.msgprint(_("Item Variants {0} updated").format(", ".join(updated))) - if renamed_old: - frappe.msgprint(_("Item Variants {0} renamed").format(", ".join(renamed_old))) + if old_variant_name: + frappe.msgprint(_("Item Variants {0} renamed").format(", ".join(old_variant_name))) if deleted: frappe.msgprint(_("Item Variants {0} deleted").format(", ".join(deleted)))