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

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

Browse Source
This commit is contained in:
Anand Doshi 2013-03-28 19:08:52 +05:30
commit 491a547708
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/march_2013/p11_update_attach_files.py
View File

@ -11,6 +11,6 @@ def execute():
else: else:
webnotes.conn.sql("""update `tab%(parent)s` webnotes.conn.sql("""update `tab%(parent)s`
set %(fieldname)s = set %(fieldname)s =
if(substr(%(fieldname)s,0,4)='http' or substr(%(fieldname)s, 0, 5)='files', if(substr(%(fieldname)s,1,4)='http' or substr(%(fieldname)s,1,5)='files',
%(fieldname)s, %(fieldname)s,
concat('files/', %(fieldname)s))""" % f) concat('files/', %(fieldname)s))""" % f)

2
setup/doctype/item_group/item_group.py
View File

@ -74,7 +74,7 @@ class DocType(DocTypeNestedSet):
for d in self.doc.sub_groups: for d in self.doc.sub_groups:
d.count = get_group_item_count(d.name) d.count = get_group_item_count(d.name)
self.doc.items = get_product_list_for_group(product_group = self.doc.name, limit=20) self.doc.items = get_product_list_for_group(product_group = self.doc.name, limit=100)
self.parent_groups = get_parent_item_groups(self.doc.name) self.parent_groups = get_parent_item_groups(self.doc.name)
self.doc.title = self.doc.name self.doc.title = self.doc.name

4
website/templates/html/product_group.html
View File

@ -29,8 +29,8 @@
{{ item }} {{ item }}
{% endfor %} {% endfor %}
</div> </div>
{% if len(items)==20 %} {% if len(items)==100 %}
<div class="alert info">Showing top 20</div> <div class="alert info">Showing top 100 items.</div>
{% endif %} {% endif %}
{% else %} {% else %}
<div class="alert">No items listed.</div> <div class="alert">No items listed.</div>