From 70d4fbb7ea2f8c916c5083c712a1ae6ee47f1463 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 21 Jan 2013 18:19:52 +0530 Subject: [PATCH 1/4] changed item from select to link in stock ledger and stock level --- stock/page/stock_ledger/stock_ledger.js | 4 ++-- stock/page/stock_level/stock_level.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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..3344811380 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", From 6dd9d4583d168c85e91c7a7f557f89c589b9371c Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 21 Jan 2013 18:44:43 +0530 Subject: [PATCH 2/4] updated payment receipt voucher format --- .../Payment Receipt Voucher.txt | 16 ++++++++-------- patches/patch_list.py | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) 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\n\n\n\n\n\n \n\n\n\n\n\n\n\n\n
Receipt No.:
Date :
Remark:
Received From:
\n
\n\n

\n

\n
This receipt is issued subject to realization of the Cheque
\n
\n
\n\n\n\n\n

For ,


(Authorised Signatory)
", + "html": "

\n\n\n\n\n\n\n\n\n\n \n\n\n\n\n\n\n\n\n
Receipt No.:
Date :
Remark:
Received From:
\n
\n\n

\n

\n
\n\n\n\n\n

For ,


(Authorised Signatory)
", + "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 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 From a495b86848448364d4bd92cc4efc9f97a489c646 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 21 Jan 2013 18:48:26 +0530 Subject: [PATCH 3/4] description in stock level --- stock/page/stock_level/stock_level.js | 1 + 1 file changed, 1 insertion(+) diff --git a/stock/page/stock_level/stock_level.js b/stock/page/stock_level/stock_level.js index 3344811380..df63d9b081 100644 --- a/stock/page/stock_level/stock_level.js +++ b/stock/page/stock_level/stock_level.js @@ -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, From f6f8ddac304ab12e4526ef776be1395c53303904 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 21 Jan 2013 18:50:03 +0530 Subject: [PATCH 4/4] contact us cache refresh issue --- website/doctype/contact_us_settings/contact_us_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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