added format_currency and added options to all currency fields

2026-05-24 15:39:20 +00:00 · 2013-01-23 19:39:51 +05:30
parent 6382a42dbe
commit 597d470e63
96 changed files with 804 additions and 604 deletions
--- a/stock/doctype/bin/bin.txt
+++ b/stock/doctype/bin/bin.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-01-10 16:34:25", 
  "docstatus": 0, 
-  "modified": "2013-01-22 13:50:19", 
+  "modified": "2013-01-23 16:53:15", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -136,7 +136,7 @@
 {
  "doctype": "DocField", 
  "fieldname": "ma_rate", 
-  "fieldtype": "Currency", 
+  "fieldtype": "Float", 
  "hidden": 1, 
  "in_filter": 0, 
  "label": "Moving Average Rate", 
@@ -159,7 +159,7 @@
 {
  "doctype": "DocField", 
  "fieldname": "fcfs_rate", 
-  "fieldtype": "Currency", 
+  "fieldtype": "Float", 
  "hidden": 1, 
  "label": "FCFS Rate", 
  "oldfieldname": "fcfs_rate", 
@@ -170,7 +170,7 @@
 {
  "doctype": "DocField", 
  "fieldname": "valuation_rate", 
-  "fieldtype": "Currency", 
+  "fieldtype": "Float", 
  "label": "Valuation Rate", 
  "oldfieldname": "valuation_rate", 
  "oldfieldtype": "Currency"
@@ -178,7 +178,7 @@
 {
  "doctype": "DocField", 
  "fieldname": "stock_value", 
-  "fieldtype": "Currency", 
+  "fieldtype": "Float", 
  "label": "Stock Value", 
  "oldfieldname": "stock_value", 
  "oldfieldtype": "Currency"
--- a/stock/doctype/delivery_note/delivery_note.txt
+++ b/stock/doctype/delivery_note/delivery_note.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-01-10 16:34:25", 
  "docstatus": 0, 
-  "modified": "2013-01-22 16:54:48", 
+  "modified": "2013-01-23 17:11:24", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -254,6 +254,7 @@
  "no_copy": 0, 
  "oldfieldname": "net_total", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "print_hide": 0, 
  "print_width": "150px", 
  "read_only": 1, 
@@ -427,6 +428,7 @@
  "label": "Taxes and Charges Total", 
  "oldfieldname": "other_charges_total", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "print_hide": 1, 
  "print_width": "150px", 
  "read_only": 1, 
@@ -466,6 +468,7 @@
  "no_copy": 0, 
  "oldfieldname": "grand_total", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "print_hide": 1, 
  "print_width": "150px", 
  "read_only": 1, 
@@ -480,6 +483,7 @@
  "no_copy": 0, 
  "oldfieldname": "rounded_total", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "print_hide": 1, 
  "print_width": "150px", 
  "read_only": 1, 
@@ -514,6 +518,7 @@
  "no_copy": 0, 
  "oldfieldname": "grand_total_export", 
  "oldfieldtype": "Currency", 
+  "options": "currency", 
  "print_hide": 0, 
  "print_width": "150px", 
  "read_only": 1, 
@@ -528,6 +533,7 @@
  "no_copy": 0, 
  "oldfieldname": "rounded_total_export", 
  "oldfieldtype": "Currency", 
+  "options": "currency", 
  "print_hide": 0, 
  "print_width": "150px", 
  "read_only": 1, 
@@ -853,7 +859,7 @@
  "description": "% of materials billed against this Delivery Note", 
  "doctype": "DocField", 
  "fieldname": "per_billed", 
-  "fieldtype": "Currency", 
+  "fieldtype": "Float", 
  "in_filter": 1, 
  "label": "% Amount Billed", 
  "no_copy": 1, 
@@ -1088,6 +1094,7 @@
  "no_copy": 0, 
  "oldfieldname": "total_commission", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "print_hide": 1, 
  "read_only": 0
 }, 
--- a/stock/doctype/delivery_note_item/delivery_note_item.txt
+++ b/stock/doctype/delivery_note_item/delivery_note_item.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-01-10 16:34:26", 
  "docstatus": 0, 
-  "modified": "2013-01-22 14:26:18", 
+  "modified": "2013-01-23 17:11:24", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -107,6 +107,7 @@
  "no_copy": 0, 
  "oldfieldname": "ref_rate", 
  "oldfieldtype": "Currency", 
+  "options": "currency", 
  "print_hide": 1, 
  "reqd": 0, 
  "width": "100px"
@@ -129,6 +130,7 @@
  "label": "Rate", 
  "oldfieldname": "export_rate", 
  "oldfieldtype": "Currency", 
+  "options": "currency", 
  "print_hide": 0, 
  "reqd": 0, 
  "width": "150px"
@@ -140,6 +142,7 @@
  "label": "Amount", 
  "oldfieldname": "export_amount", 
  "oldfieldtype": "Currency", 
+  "options": "currency", 
  "print_hide": 0, 
  "read_only": 1, 
  "reqd": 0, 
@@ -152,6 +155,7 @@
  "label": "Price List Rate*", 
  "oldfieldname": "base_ref_rate", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "print_hide": 1, 
  "read_only": 1, 
  "width": "100px"
@@ -164,6 +168,7 @@
  "label": "Rate*", 
  "oldfieldname": "basic_rate", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "print_hide": 1, 
  "reqd": 0, 
  "width": "150px"
@@ -175,6 +180,7 @@
  "label": "Amount*", 
  "oldfieldname": "amount", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "print_hide": 1, 
  "read_only": 1, 
  "reqd": 0, 
@@ -255,6 +261,7 @@
  "fieldtype": "Currency", 
  "label": "Billed Amt", 
  "no_copy": 1, 
+  "options": "currency", 
  "print_hide": 1, 
  "read_only": 1, 
  "width": "100px"
--- a/stock/doctype/item/item.txt
+++ b/stock/doctype/item/item.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-01-21 18:19:22", 
  "docstatus": 0, 
-  "modified": "2013-01-22 14:47:00", 
+  "modified": "2013-01-23 17:00:07", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -381,7 +381,7 @@
  "description": "Buying Cost will be updated from Purchase Orders and Purchase Receipts. <br>The buying cost will calculated by moving average method.", 
  "doctype": "DocField", 
  "fieldname": "buying_cost", 
-  "fieldtype": "Currency", 
+  "fieldtype": "Float", 
  "label": "Buying Cost", 
  "no_copy": 1, 
  "oldfieldname": "buying_cost", 
@@ -392,7 +392,7 @@
  "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
  "doctype": "DocField", 
  "fieldname": "last_purchase_rate", 
-  "fieldtype": "Currency", 
+  "fieldtype": "Float", 
  "label": "Last Purchase Rate", 
  "no_copy": 1, 
  "oldfieldname": "last_purchase_rate", 
@@ -403,7 +403,7 @@
  "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
  "doctype": "DocField", 
  "fieldname": "standard_rate", 
-  "fieldtype": "Currency", 
+  "fieldtype": "Float", 
  "label": "Standard Rate", 
  "oldfieldname": "standard_rate", 
  "oldfieldtype": "Currency"
@@ -525,7 +525,7 @@
  "depends_on": "eval:doc.is_sales_item==\"Yes\"", 
  "doctype": "DocField", 
  "fieldname": "sales_rate", 
-  "fieldtype": "Currency", 
+  "fieldtype": "Float", 
  "hidden": 1, 
  "label": "Sales Rate", 
  "oldfieldname": "sales_rate", 
--- a/stock/doctype/item_price/item_price.txt
+++ b/stock/doctype/item_price/item_price.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-01-21 18:19:14", 
  "docstatus": 0, 
-  "modified": "2013-01-22 16:54:49", 
+  "modified": "2013-01-23 16:57:49", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -47,6 +47,7 @@
  "label": "Ref Rate", 
  "oldfieldname": "ref_rate", 
  "oldfieldtype": "Currency", 
+  "options": "ref_currency", 
  "reqd": 0, 
  "search_index": 0
 }, 
--- a/stock/doctype/item_tax/item_tax.txt
+++ b/stock/doctype/item_tax/item_tax.txt
@@ -1,51 +1,46 @@
 [
 {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:27", 
  "docstatus": 0, 
-  "creation": "2012-03-27 14:36:33", 
+  "modified": "2013-01-23 16:54:25", 
  "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:36:33"
+  "owner": "Administrator"
 }, 
 {
-  "section_style": "Tray", 
+  "doctype": "DocType", 
  "istable": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
  "module": "Stock", 
-  "show_in_menu": 0, 
-  "server_code_error": " ", 
-  "doctype": "DocType"
+  "name": "__common__"
 }, 
 {
+  "doctype": "DocField", 
  "name": "__common__", 
  "parent": "Item Tax", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "parentfield": "fields"
+  "permlevel": 0
 }, 
 {
-  "name": "Item Tax", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Item Tax"
 }, 
 {
-  "oldfieldtype": "Link", 
  "doctype": "DocField", 
-  "label": "Tax", 
-  "oldfieldname": "tax_type", 
-  "trigger": "Client", 
  "fieldname": "tax_type", 
  "fieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Account"
+  "label": "Tax", 
+  "oldfieldname": "tax_type", 
+  "oldfieldtype": "Link", 
+  "options": "Account", 
+  "reqd": 1
 }, 
 {
-  "oldfieldtype": "Currency", 
  "doctype": "DocField", 
+  "fieldname": "tax_rate", 
+  "fieldtype": "Float", 
  "label": "Tax Rate", 
  "oldfieldname": "tax_rate", 
-  "fieldname": "tax_rate", 
-  "fieldtype": "Currency", 
+  "oldfieldtype": "Currency", 
  "reqd": 0
 }
 ]
--- a/stock/doctype/landed_cost_item/landed_cost_item.txt
+++ b/stock/doctype/landed_cost_item/landed_cost_item.txt
@@ -1,60 +1,56 @@
 [
 {
-  "owner": "wasim@webnotestech.com", 
+  "creation": "2013-01-10 16:34:27", 
  "docstatus": 0, 
-  "creation": "2012-05-03 11:00:55", 
+  "modified": "2013-01-23 16:55:26", 
  "modified_by": "Administrator", 
-  "modified": "2012-05-04 13:02:26"
+  "owner": "wasim@webnotestech.com"
 }, 
 {
-  "section_style": "Simple", 
+  "doctype": "DocType", 
  "istable": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
  "module": "Stock", 
-  "show_in_menu": 0, 
-  "version": 1, 
-  "server_code_error": " ", 
-  "doctype": "DocType"
+  "name": "__common__"
 }, 
 {
+  "doctype": "DocField", 
  "name": "__common__", 
  "parent": "Landed Cost Item", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
  "parenttype": "DocType", 
-  "reqd": 1, 
  "permlevel": 0, 
-  "parentfield": "fields"
+  "reqd": 1
 }, 
 {
-  "name": "Landed Cost Item", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Landed Cost Item"
 }, 
 {
-  "search_index": 1, 
  "doctype": "DocField", 
-  "label": "Account Head", 
-  "oldfieldname": "account_head", 
  "fieldname": "account_head", 
  "fieldtype": "Link", 
+  "label": "Account Head", 
+  "oldfieldname": "account_head", 
  "oldfieldtype": "Link", 
-  "options": "Account"
+  "options": "Account", 
+  "search_index": 1
 }, 
 {
-  "oldfieldtype": "Data", 
  "doctype": "DocField", 
+  "fieldname": "description", 
+  "fieldtype": "Data", 
  "label": "Description", 
  "oldfieldname": "description", 
-  "width": "300px", 
-  "fieldname": "description", 
-  "fieldtype": "Data"
+  "oldfieldtype": "Data", 
+  "width": "300px"
 }, 
 {
-  "oldfieldtype": "Currency", 
  "doctype": "DocField", 
+  "fieldname": "amount", 
+  "fieldtype": "Currency", 
  "label": "Amount", 
  "oldfieldname": "amount", 
-  "fieldname": "amount", 
-  "fieldtype": "Currency"
+  "oldfieldtype": "Currency", 
+  "options": "currency"
 }
 ]
--- a/stock/doctype/purchase_receipt/purchase_receipt.txt
+++ b/stock/doctype/purchase_receipt/purchase_receipt.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-01-22 15:24:18", 
  "docstatus": 0, 
-  "modified": "2013-01-22 16:55:22", 
+  "modified": "2013-01-23 17:11:30", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -390,6 +390,7 @@
  "label": "Net Total (Import)", 
  "oldfieldname": "net_total_import", 
  "oldfieldtype": "Currency", 
+  "options": "currency", 
  "print_hide": 1, 
  "read_only": 1
 }, 
@@ -400,6 +401,7 @@
  "label": "Taxes and Charges Added (Import)", 
  "oldfieldname": "other_charges_added_import", 
  "oldfieldtype": "Currency", 
+  "options": "currency", 
  "print_hide": 1, 
  "read_only": 1
 }, 
@@ -410,6 +412,7 @@
  "label": "Taxes and Charges Deducted (Import)", 
  "oldfieldname": "other_charges_deducted_import", 
  "oldfieldtype": "Currency", 
+  "options": "currency", 
  "print_hide": 1, 
  "read_only": 1
 }, 
@@ -420,6 +423,7 @@
  "label": "Grand Total (Import)", 
  "oldfieldname": "grand_total_import", 
  "oldfieldtype": "Currency", 
+  "options": "currency", 
  "print_hide": 1, 
  "read_only": 1
 }, 
@@ -447,6 +451,7 @@
  "label": "Net Total", 
  "oldfieldname": "net_total", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "print_hide": 1, 
  "print_width": "150px", 
  "read_only": 1, 
@@ -460,6 +465,7 @@
  "label": "Taxes and Charges Added", 
  "oldfieldname": "other_charges_added", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "print_hide": 1, 
  "read_only": 1
 }, 
@@ -470,6 +476,7 @@
  "label": "Taxes and Charges Deducted", 
  "oldfieldname": "other_charges_deducted", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "print_hide": 1, 
  "read_only": 1
 }, 
@@ -480,6 +487,7 @@
  "label": "Total Tax", 
  "oldfieldname": "total_tax", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "print_hide": 1, 
  "read_only": 1
 }, 
@@ -490,6 +498,7 @@
  "label": "Grand Total", 
  "oldfieldname": "grand_total", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "print_hide": 1, 
  "read_only": 1
 }, 
@@ -500,6 +509,7 @@
  "label": "Rounded Total", 
  "oldfieldname": "rounded_total", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "print_hide": 1, 
  "read_only": 1
 }, 
--- a/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
+++ b/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-01-10 16:34:28", 
  "docstatus": 0, 
-  "modified": "2013-01-22 15:02:34", 
+  "modified": "2013-01-23 17:11:25", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -118,6 +118,7 @@
  "fieldname": "import_ref_rate", 
  "fieldtype": "Currency", 
  "label": "Ref Rate ", 
+  "options": "currency", 
  "print_hide": 1
 }, 
 {
@@ -135,6 +136,7 @@
  "label": "Rate", 
  "oldfieldname": "import_rate", 
  "oldfieldtype": "Currency", 
+  "options": "currency", 
  "print_hide": 0, 
  "print_width": "100px", 
  "width": "100px"
@@ -146,6 +148,7 @@
  "label": "Amount", 
  "oldfieldname": "import_amount", 
  "oldfieldtype": "Currency", 
+  "options": "currency", 
  "read_only": 1
 }, 
 {
@@ -153,6 +156,7 @@
  "fieldname": "purchase_ref_rate", 
  "fieldtype": "Currency", 
  "label": "Ref Rate *", 
+  "options": "eval:erpnext.get_currency()", 
  "print_hide": 1
 }, 
 {
@@ -163,6 +167,7 @@
  "label": "Rate *(Default Curr.)", 
  "oldfieldname": "purchase_rate", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "print_hide": 1, 
  "print_width": "100px", 
  "reqd": 1, 
@@ -176,6 +181,7 @@
  "label": "Amount (Default Curr.)", 
  "oldfieldname": "amount", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "print_hide": 1, 
  "print_width": "100px", 
  "reqd": 0, 
@@ -381,6 +387,7 @@
  "label": "Raw Materials Supplied Cost", 
  "oldfieldname": "rm_supp_cost", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "print_hide": 1, 
  "print_width": "150px", 
  "read_only": 1, 
@@ -395,6 +402,7 @@
  "no_copy": 1, 
  "oldfieldname": "item_tax_amount", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "print_hide": 1, 
  "print_width": "150px", 
  "read_only": 1, 
@@ -442,6 +450,7 @@
  "no_copy": 1, 
  "oldfieldname": "valuation_rate", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "print_hide": 1, 
  "print_width": "80px", 
  "read_only": 1, 
--- a/stock/doctype/sales_and_purchase_return_tool/sales_and_purchase_return_tool.js
+++ b/stock/doctype/sales_and_purchase_return_tool/sales_and_purchase_return_tool.js
@@ -14,6 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.

+cur_frm.add_fetch("delivery_note_no", "company", "company");
+cur_frm.add_fetch("sales_invoice_no", "company", "company");
+cur_frm.add_fetch("purchase_receipt_no", "company", "company");
+
 // Onload
 //-------------------------------
 cur_frm.cscript.onload = function(doc,dt,dn){
@@ -217,7 +221,7 @@ cur_frm.cscript.make_jv = function(doc, dr_or_cr, children) {
 		for(var i=0; i<children.length; i++) {
 			var ch = wn.model.add_child(jv, 'Journal Voucher Detail', 'entries');
 			$.extend(ch, children[i]);
-			ch.balance = fmt_money(ch.balance);
+			ch.balance = flt(ch.balance);
 		}
 	}

--- a/stock/doctype/sales_and_purchase_return_tool/sales_and_purchase_return_tool.txt
+++ b/stock/doctype/sales_and_purchase_return_tool/sales_and_purchase_return_tool.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-01-10 16:34:29", 
  "docstatus": 0, 
-  "modified": "2013-01-22 14:57:23", 
+  "modified": "2013-01-23 16:48:38", 
  "modified_by": "Administrator", 
  "owner": "wasim@webnotestech.com"
 }, 
@@ -30,7 +30,7 @@
  "parenttype": "DocType", 
  "permlevel": 0, 
  "read": 1, 
-  "report": 1, 
+  "report": 0, 
  "submit": 0, 
  "write": 1
 }, 
@@ -90,6 +90,15 @@
  "oldfieldtype": "Link", 
  "options": "Purchase Receipt"
 }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "company", 
+  "fieldtype": "Link", 
+  "hidden": 1, 
+  "label": "Company", 
+  "options": "Company", 
+  "print_hide": 1
+ }, 
 {
  "doctype": "DocField", 
  "fieldname": "cust_supp", 
@@ -175,22 +184,6 @@
  "doctype": "DocPerm", 
  "role": "Material User"
 }, 
- {
-  "amend": 0, 
-  "cancel": 0, 
-  "doctype": "DocPerm", 
-  "role": "Material Manager"
- }, 
- {
-  "amend": 0, 
-  "cancel": 0, 
-  "doctype": "DocPerm", 
-  "role": "System Manager"
- }, 
- {
-  "doctype": "DocPerm", 
-  "role": "Accounts Manager"
- }, 
 {
  "doctype": "DocPerm", 
  "role": "Accounts User"
--- a/stock/doctype/sales_bom_item/sales_bom_item.txt
+++ b/stock/doctype/sales_bom_item/sales_bom_item.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-01-10 16:34:29", 
  "docstatus": 0, 
-  "modified": "2013-01-22 14:47:59", 
+  "modified": "2013-01-23 16:56:21", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -55,7 +55,7 @@
 {
  "doctype": "DocField", 
  "fieldname": "rate", 
-  "fieldtype": "Currency", 
+  "fieldtype": "Float", 
  "label": "Rate", 
  "oldfieldname": "rate", 
  "oldfieldtype": "Currency"
--- a/stock/doctype/serial_no/serial_no.txt
+++ b/stock/doctype/serial_no/serial_no.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-01-10 16:34:29", 
  "docstatus": 0, 
-  "modified": "2013-01-22 14:50:06", 
+  "modified": "2013-01-23 17:11:26", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -196,6 +196,7 @@
  "no_copy": 1, 
  "oldfieldname": "purchase_rate", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "reqd": 1, 
  "search_index": 0
 }, 
--- a/stock/doctype/stock_entry_detail/stock_entry_detail.txt
+++ b/stock/doctype/stock_entry_detail/stock_entry_detail.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-01-14 16:33:34", 
  "docstatus": 0, 
-  "modified": "2013-01-22 14:50:07", 
+  "modified": "2013-01-23 17:11:26", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -101,6 +101,7 @@
  "label": "Valuation Rate", 
  "oldfieldname": "incoming_rate", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "read_only": 0, 
  "reqd": 0
 }, 
@@ -111,6 +112,7 @@
  "label": "Amount", 
  "oldfieldname": "amount", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "read_only": 1
 }, 
 {
--- a/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt
+++ b/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-01-14 16:33:26", 
  "docstatus": 0, 
-  "modified": "2013-01-22 14:57:24", 
+  "modified": "2013-01-23 17:11:26", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -180,7 +180,8 @@
  "fieldtype": "Currency", 
  "label": "Incoming Rate", 
  "oldfieldname": "incoming_rate", 
-  "oldfieldtype": "Currency"
+  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()"
 }, 
 {
  "doctype": "DocField", 
@@ -210,6 +211,7 @@
  "label": "Valuation Rate", 
  "oldfieldname": "valuation_rate", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "print_width": "150px", 
  "width": "150px"
 }, 
@@ -219,7 +221,8 @@
  "fieldtype": "Currency", 
  "label": "Stock Value", 
  "oldfieldname": "stock_value", 
-  "oldfieldtype": "Currency"
+  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()"
 }, 
 {
  "doctype": "DocField", 
--- a/stock/page/stock_ledger/stock_ledger.js
+++ b/stock/page/stock_ledger/stock_ledger.js
@@ -255,7 +255,7 @@ erpnext.StockLedger = erpnext.StockGridReport.extend({
 	get_tooltip_text: function(label, x, y) {
 		var d = new Date(x);
 		var date = dateutil.obj_to_user(d) + " " + d.getHours() + ":" + d.getMinutes();
-	 	var value = fmt_money(y);
+	 	var value = format_number(y);
 		return value.bold() + " on " + date;
 	}
 });