Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/accounts/Print Format/Payment Receipt Voucher/Payment Receipt Voucher.txt b/accounts/Print Format/Payment Receipt Voucher/Payment Receipt Voucher.txt
index bd9a52e..73bc63b 100755
--- a/accounts/Print Format/Payment Receipt Voucher/Payment Receipt Voucher.txt
+++ b/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"
}
]
\ No newline at end of file
diff --git a/patches/patch_list.py b/patches/patch_list.py
index 2788093..dda3524 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -153,4 +153,5 @@
"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')",
]
\ No newline at end of file
diff --git a/stock/page/stock_ledger/stock_ledger.js b/stock/page/stock_ledger/stock_ledger.js
index b6b536d..27e6272 100644
--- a/stock/page/stock_ledger/stock_ledger.js
+++ b/stock/page/stock_ledger/stock_ledger.js
@@ -79,9 +79,9 @@
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) {
diff --git a/stock/page/stock_level/stock_level.js b/stock/page/stock_level/stock_level.js
index 9c755ef..df63d9b 100644
--- a/stock/page/stock_level/stock_level.js
+++ b/stock/page/stock_level/stock_level.js
@@ -98,9 +98,9 @@
},
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 @@
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,
diff --git a/website/doctype/contact_us_settings/contact_us_settings.py b/website/doctype/contact_us_settings/contact_us_settings.py
index 0dda32b..8e6ef29 100644
--- a/website/doctype/contact_us_settings/contact_us_settings.py
+++ b/website/doctype/contact_us_settings/contact_us_settings.py
@@ -18,4 +18,4 @@
def on_update(self):
from website.utils import clear_cache
- clear_cache("about")
\ No newline at end of file
+ clear_cache("contact")
\ No newline at end of file