nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 18:21:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext into sales_purchase_return

Browse Source 
Conflicts:
	patches/patch_list.py
This commit is contained in:
Anand Doshi
2013-03-18 17:42:08 +05:30
parent ab7b7c2974 edf639b607
commit f11e2f8f6f
18 changed files with 433 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
stock/doctype/item/item.py
View File

@@ -238,8 +238,7 @@ class DocType(DocListController):
from website.helpers.product import get_parent_item_groups, url_for_website
self.parent_groups = get_parent_item_groups(self.doc.item_group) + [{"name":self.doc.name}]
self.doc.website_image = url_for_website(self.doc.website_image)
self.doc.title = self.doc.item_name == self.doc.name and self.doc.item_name or \
(self.doc.item_name + " [" + self.doc.name + "]")
self.doc.title = self.doc.item_name
if self.doc.slideshow:
from website.helpers.slideshow import get_slideshow