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 bd9a52e095..73bc63b790 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": "
\n
\n
\n\n\n\n\n Receipt No.: | \n | \n
\n\n Date : | \n | \n
\n\n Remark: | \n | \n
\n\n Received From: | \n | \n
\n
\n
\n\n
\n
\nThis receipt is issued subject to realization of the Cheque
\n\n
\n\n\nFor ,
(Authorised Signatory) | \n
\n
",
+ "html": "\n\n\n\n Receipt No.: | \n | \n
\n\n Date : | \n | \n
\n\n Remark: | \n | \n
\n\n Received From: | \n | \n
\n
\n
\n\n
\n
\n
\n\n\nFor ,
(Authorised Signatory) | \n
\n
",
+ "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/buying/utils.py b/buying/utils.py
index d623020987..97efbc7333 100644
--- a/buying/utils.py
+++ b/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
diff --git a/patches/patch_list.py b/patches/patch_list.py
index 278809361c..dda35247a4 100644
--- a/patches/patch_list.py
+++ b/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')",
]
\ 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 b6b536d5ff..27e62723b8 100644
--- a/stock/page/stock_ledger/stock_ledger.js
+++ b/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) {
diff --git a/stock/page/stock_level/stock_level.js b/stock/page/stock_level/stock_level.js
index 9c755ef806..df63d9b081 100644
--- a/stock/page/stock_level/stock_level.js
+++ b/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,
diff --git a/website/doctype/contact_us_settings/contact_us_settings.py b/website/doctype/contact_us_settings/contact_us_settings.py
index 0dda32b75a..8e6ef29474 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 @@ class DocType:
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