Merge branch 'edge' of github.com:webnotes/erpnext into edge
diff --git a/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt b/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
index fd73c87..8c20d4c 100755
--- a/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
+++ b/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-07 08:28:23",
"docstatus": 0,
- "modified": "2013-02-08 14:06:15",
+ "modified": "2013-02-11 08:13:11",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -385,6 +385,7 @@
"hidden": 1,
"in_filter": 0,
"label": "Raw Materials Supplied Cost",
+ "no_copy": 1,
"oldfieldname": "rm_supp_cost",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
diff --git a/website/helpers/product.py b/website/helpers/product.py
index 2685d10..ef433b1 100644
--- a/website/helpers/product.py
+++ b/website/helpers/product.py
@@ -28,9 +28,7 @@
}
@webnotes.whitelist(allow_guest=True)
-def get_product_list(search=None, product_group=None, start=0, limit=10):
- # DOUBT: why is product_group param passed?
-
+def get_product_list(search=None, start=0, limit=10):
# base query
query = """select name, item_name, page_name, website_image, item_group,
web_long_description as website_description
@@ -47,7 +45,6 @@
data = webnotes.conn.sql(query, {
"search": search,
- "product_group": product_group
}, as_dict=1)
return [get_item_for_list_in_html(r) for r in data]