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

accounts/Print Format/Payment Receipt Voucher/Payment Receipt Voucher.txt

@@ -1,21 +1,21 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2012-05-01 12:46:31", 
   "docstatus": 0, 
-  "creation": "2012-04-11 13:16:56", 
+  "modified": "2013-01-21 18:40:20", 
   "modified_by": "Administrator", 
-  "modified": "2012-04-13 12:24:59"
+  "owner": "Administrator"
  }, 
  {
   "doc_type": "Journal Voucher", 
-  "name": "__common__", 
-  "module": "Accounts", 
   "doctype": "Print Format", 
-  "html": "<div style=\"position: relative;\">\n<h3 align=\"center\"><script>doc.company</script>\n</div>\n\n<font size=\"4\">\n<table class='simpletable'>\n<tr>\n<td><b> Receipt No.: </b></td>\n<td><script>doc.name</script></td>\n</tr>\n<tr>\n<td><b> Date : </b></td>\n<td><script>date.str_to_user(doc.voucher_date)</script></td>\n</tr>      \n<tr>\n<td><b> Remark: </b></td>\n<td><script> doc.remark </script></td>\n</tr>\n<tr>\n<td><b> Received From: </b></td>\n<td><b><script> doc.pay_to_rec_from </script></b></td>\n</tr>\n</table>\n<br>\n\n<div><b><script>doc.total_amount</script></b> </td></div><br>\n<div style=\"text-align:left\"><b><script>doc.total_amount_in_words</script></b></div><br>\n<div>This receipt is issued subject to realization of the Cheque</div>\n</font>\n<br>\n<table class=\"noborder\">\n<tr>\n<td style = \"text-align = right;\"><h3>For <script>doc.company</script>,</h3><br><div>(Authorised Signatory)</div></td>\n</tr>\n</table>", 
+  "html": "<h3 align=\"center\"><script>doc.select_print_heading || \"Payment Receipt Note\"</script></h3>\n\n<table class='simpletable'>\n<tr>\n<td><b> Receipt No.: </b></td>\n<td><script>doc.name</script></td>\n</tr>\n<tr>\n<td><b> Date : </b></td>\n<td><script>date.str_to_user(doc.voucher_date)</script></td>\n</tr>      \n<tr>\n<td><b> Remark: </b></td>\n<td><script> doc.remark </script></td>\n</tr>\n<tr>\n<td><b> Received From: </b></td>\n<td><b><script> doc.pay_to_recd_from </script></b></td>\n</tr>\n</table>\n<br>\n\n<div><b><script>doc.total_amount</script></b> </td></div><br>\n<div style=\"text-align:left\"><b><script>doc.total_amount_in_words</script></b></div><br>\n<br>\n<table class=\"noborder\">\n<tr>\n<td style = \"text-align = right;\"><h3>For <script>doc.company</script>,</h3><br><div>(Authorised Signatory)</div></td>\n</tr>\n</table>", 
+  "module": "Accounts", 
+  "name": "__common__", 
   "standard": "Yes"
  }, 
  {
-  "name": "Payment Receipt Voucher", 
-  "doctype": "Print Format"
+  "doctype": "Print Format", 
+  "name": "Payment Receipt Voucher"
  }
 ]

buying/utils.py

@@ -56,7 +56,7 @@ def get_item_details(args):
 		"conversion_factor": 1,
 		"warehouse": args.warehouse or item.default_warehouse,
 		"item_tax_rate": json.dumps(dict(([d.tax_type, d.tax_rate] for d in 
-			item_wrapper.doclist.get({"parentfield": "ref_rate_details"})))),
+			item_wrapper.doclist.get({"parentfield": "item_tax"})))),
 		"batch_no": None,
 		"expense_head": item.purchase_account,
 		"cost_center": item.cost_center

patches/patch_list.py

@@ -153,4 +153,5 @@ patch_list = [
 	"patches.january_2013.remove_tds_entry_from_gl_mapper",
 	"patches.january_2013.update_number_format",
 	"patches.january_2013.purchase_price_list",
+	"execute:webnotes.reload_doc('accounts','Print Format','Payment Receipt Voucher')",
 ]

stock/page/stock_ledger/stock_ledger.js

@@ -79,9 +79,9 @@ erpnext.StockLedger = erpnext.StockGridReport.extend({
 			default_value: "Select Warehouse...", filter: function(val, item, opts) {
 				return item.warehouse == val || val == opts.default_value;
 			}},
-		{fieldtype:"Select", label: "Item Code", link:"Item", default_value: "Select Item...",
+		{fieldtype:"Link", label: "Item Code", link:"Item", default_value: "Select Item...",
 			filter: function(val, item, opts) {
-				return item.item_code == val || val == opts.default_value;
+				return item.item_code == val || !val;
 			}},
 		{fieldtype:"Select", label: "Brand", link:"Brand", 
 			default_value: "Select Brand...", filter: function(val, item, opts) {

stock/page/stock_level/stock_level.js

@@ -98,9 +98,9 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({
 	},
 	
 	filters: [
-		{fieldtype:"Select", label: "Item Code", link:"Item", default_value: "Select Item...",
+		{fieldtype:"Link", label: "Item Code", link:"Item", default_value: "Select Item...",
 			filter: function(val, item, opts) {
-				return item.item_code == val || val == opts.default_value;
+				return item.item_code == val || !val;
 			}},
 			
 		{fieldtype:"Select", label: "Warehouse", link:"Warehouse", 
@@ -200,6 +200,7 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({
 			var row = {
 				item_code: item_code,
 				warehouse: warehouse,
+				description: item.description,
 				brand: item.brand,
 				item_name: item.item_name || item.name,
 				uom: item.stock_uom,

website/doctype/contact_us_settings/contact_us_settings.py

@@ -18,4 +18,4 @@ class DocType:
 			
 	def on_update(self):
 		from website.utils import clear_cache
-		clear_cache("about")
+		clear_cache("contact")