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

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

Browse Source
This commit is contained in:
Rushabh Mehta 2013-02-12 07:20:49 +01:00
commit af7ae5a5d4
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-02-07 08:28:23", "creation": "2013-02-07 08:28:23",
"docstatus": 0, "docstatus": 0,
"modified": "2013-02-08 14:06:15", "modified": "2013-02-11 08:13:11",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -385,6 +385,7 @@
"hidden": 1, "hidden": 1,
"in_filter": 0, "in_filter": 0,
"label": "Raw Materials Supplied Cost", "label": "Raw Materials Supplied Cost",
"no_copy": 1,
"oldfieldname": "rm_supp_cost", "oldfieldname": "rm_supp_cost",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
"options": "Company:company:default_currency", "options": "Company:company:default_currency",

5
website/helpers/product.py
View File

@ -28,9 +28,7 @@ def get_product_info(item_code):
} }
@webnotes.whitelist(allow_guest=True) @webnotes.whitelist(allow_guest=True)
def get_product_list(search=None, product_group=None, start=0, limit=10): def get_product_list(search=None, start=0, limit=10):
# DOUBT: why is product_group param passed?
# base query # base query
query = """select name, item_name, page_name, website_image, item_group, query = """select name, item_name, page_name, website_image, item_group,
web_long_description as website_description web_long_description as website_description
@ -47,7 +45,6 @@ def get_product_list(search=None, product_group=None, start=0, limit=10):
data = webnotes.conn.sql(query, { data = webnotes.conn.sql(query, {
"search": search, "search": search,
"product_group": product_group
}, as_dict=1) }, as_dict=1)
return [get_item_for_list_in_html(r) for r in data] return [get_item_for_list_in_html(r) for r in data]