Merge pull request #1067 from akhileshdarjee/master

[fix] [minor] added price list in supplier form

buying/doctype/supplier/supplier.js

@@ -91,4 +91,10 @@ cur_frm.cscript.make_contact = function() {
 		// note: render_contact_row is defined in contact_control.js
 	}
 	cur_frm.contact_list.run();
+}
+
+cur_frm.fields_dict['default_price_list'].get_query = function(doc,cdt,cdn) {
+	return{
+		filters:{'buying_or_selling': "Buying"}
+	}
 }

buying/doctype/supplier/supplier.txt

@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:11", 
   "docstatus": 0, 
-  "modified": "2013-11-03 14:01:43", 
+  "modified": "2013-11-19 11:31:28", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -153,6 +153,13 @@
   "reqd": 1, 
   "search_index": 0
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "default_price_list", 
+  "fieldtype": "Link", 
+  "label": "Price List", 
+  "options": "Price List"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "default_currency", 

selling/doctype/customer/customer.js

@@ -110,7 +110,7 @@ cur_frm.cscript.make_contact = function() {
 cur_frm.fields_dict['customer_group'].get_query = function(doc,dt,dn) {
 	return{
 		filters:{'is_group': 'No'}
-	}	
+	}
 }
 
 
@@ -119,3 +119,9 @@ cur_frm.fields_dict.lead_name.get_query = function(doc,cdt,cdn) {
 		query:"controllers.queries.lead_query"
 	}
 }
+
+cur_frm.fields_dict['default_price_list'].get_query = function(doc,cdt,cdn) {
+	return{
+		filters:{'buying_or_selling': "Selling"}
+	}
+}

stock/doctype/item/templates/includes/product_search_box.html

@@ -13,17 +13,18 @@
 	<script>
 		// redirect to product search page
 		$(document).ready(function() {
-			$('.dropdown-toggle').dropdown()
+			$('.dropdown-toggle').dropdown();
 			$("#btn-product-search").click(function() {
 				var txt = $("#product-search").val();
 				if(txt) {
-					window.location.href="product_search.html?q=" + txt;
+					window.location.href="product_search?q=" + txt;
 				}
 				return false;
 			});
 			$("#product-search").keypress(function(e) {
-				if(e.which==13) $("#product-search-btn").click();
-			})
-		})
+				if(e.which==13) $("#btn-product-search").click();
+			});
+			$(".form-search").on("submit", function() { return false; });
+		});
 	</script>
 </div>

utilities/transaction_base.py

@@ -120,6 +120,8 @@ class TransactionBase(StatusUpdater):
 		out["supplier_name"] = supplier.supplier_name
 		if supplier.default_currency:
 			out["currency"] = supplier.default_currency
+		if supplier.default_price_list:
+			out["buying_price_list"] = supplier.default_price_list
 		
 		return out