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

[fix] item variants not directly shown in website due to route clash

Browse Source
This commit is contained in:
Rushabh Mehta 2016-12-27 12:29:11 +05:30
parent c2690425e3
commit 174c3478a1
5 changed files with 2719 additions and 2678 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/patches.txt
View File

@ -359,3 +359,4 @@ erpnext.patches.v7_1.set_currency_exchange_date
erpnext.patches.v7_1.set_sales_person_status erpnext.patches.v7_1.set_sales_person_status
erpnext.patches.v7_1.repost_stock_for_deleted_bins_for_merging_items erpnext.patches.v7_1.repost_stock_for_deleted_bins_for_merging_items
execute:frappe.delete_doc('Desktop Icon', {'module_name': 'Profit and Loss Statment'}) execute:frappe.delete_doc('Desktop Icon', {'module_name': 'Profit and Loss Statment'})
erpnext.patches.v7_2.update_website_for_variant

0
erpnext/patches/v7_2/__init__.py Normal file
View File

12
erpnext/patches/v7_2/update_website_for_variant.py Normal file
View File

@ -0,0 +1,12 @@
import frappe
def execute():
# variant must have show_in_website = 0
frappe.reload_doctype('Item')
frappe.db.sql('''
update tabItem set
show_variant_in_website = 1,
show_in_website = 0
where
show_in_website=1
and ifnull(variant_of, "")!=""''')

5362
erpnext/stock/doctype/item/item.json
View File

File diff suppressed because it is too large Load Diff

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

@ -5,7 +5,6 @@ from __future__ import unicode_literals
import frappe import frappe
import erpnext import erpnext
import json import json
import urllib
import itertools import itertools
from frappe import msgprint, _ from frappe import msgprint, _
from frappe.utils import cstr, flt, cint, getdate, now_datetime, formatdate, strip from frappe.utils import cstr, flt, cint, getdate, now_datetime, formatdate, strip
@ -238,19 +237,12 @@ class Item(WebsiteGenerator):
def get_context(self, context): def get_context(self, context):
context.show_search=True context.show_search=True
context.search_link = '/product_search' context.search_link = '/product_search'
if self.variant_of:
# redirect to template page!
template_item = frappe.get_doc("Item", self.variant_of)
frappe.flags.redirect_location = template_item.route + "?variant=" + urllib.quote(self.name)
raise frappe.Redirect
context.parent_groups = get_parent_item_groups(self.item_group) + \ context.parent_groups = get_parent_item_groups(self.item_group) + \
[{"name": self.name}] [{"name": self.name}]
self.set_variant_context(context) self.set_variant_context(context)
self.set_attribute_context(context) self.set_attribute_context(context)
self.set_disabled_attributes(context) self.set_disabled_attributes(context)
context.parents = self.get_parents(context) context.parents = self.get_parents(context)
@ -264,7 +256,8 @@ class Item(WebsiteGenerator):
# load variants # load variants
# also used in set_attribute_context # also used in set_attribute_context
context.variants = frappe.get_all("Item", context.variants = frappe.get_all("Item",
filters={"variant_of": self.name, "show_in_website": 1}, order_by="name asc") filters={"variant_of": self.name, "show_variant_in_website": 1},
order_by="name asc")
variant = frappe.form_dict.variant variant = frappe.form_dict.variant
if not variant and context.variants: if not variant and context.variants:
@ -565,12 +558,12 @@ class Item(WebsiteGenerator):
existing_allow_negative_stock = frappe.db.get_value("Stock Settings", None, "allow_negative_stock") existing_allow_negative_stock = frappe.db.get_value("Stock Settings", None, "allow_negative_stock")
frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1) frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
repost_stock_for_warehouses = frappe.db.sql_list("""select distinct warehouse repost_stock_for_warehouses = frappe.db.sql_list("""select distinct warehouse
from tabBin where item_code=%s""", new_name) from tabBin where item_code=%s""", new_name)
# Delete all existing bins to avoid duplicate bins for the same item and warehouse # Delete all existing bins to avoid duplicate bins for the same item and warehouse
frappe.db.sql("delete from `tabBin` where item_code=%s", new_name) frappe.db.sql("delete from `tabBin` where item_code=%s", new_name)
for warehouse in repost_stock_for_warehouses: for warehouse in repost_stock_for_warehouses:
repost_stock(new_name, warehouse) repost_stock(new_name, warehouse)
@ -597,6 +590,11 @@ class Item(WebsiteGenerator):
def update_template_item(self): def update_template_item(self):
"""Set Show in Website for Template Item if True for its Variant""" """Set Show in Website for Template Item if True for its Variant"""
if self.variant_of and self.show_in_website: if self.variant_of and self.show_in_website:
self.show_variant_in_website = 1
self.show_in_website = 0
if self.show_variant_in_website:
# show template
template_item = frappe.get_doc("Item", self.variant_of) template_item = frappe.get_doc("Item", self.variant_of)
if not template_item.show_in_website: if not template_item.show_in_website: