added format_currency and added options to all currency fields

2026-05-15 11:09:17 +00:00 · 2013-01-23 19:39:51 +05:30
parent 6382a42dbe
commit 597d470e63
96 changed files with 804 additions and 604 deletions
--- a/hr/doctype/earning_type/earning_type.txt
+++ b/hr/doctype/earning_type/earning_type.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-01-10 16:34:13", 
  "docstatus": 0, 
-  "modified": "2013-01-22 14:46:41", 
+  "modified": "2013-01-23 16:32:07", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -81,7 +81,7 @@
  "depends_on": "eval:doc.taxable=='No'", 
  "doctype": "DocField", 
  "fieldname": "exemption_limit", 
-  "fieldtype": "Currency", 
+  "fieldtype": "Float", 
  "hidden": 1, 
  "label": "Exemption Limit", 
  "oldfieldname": "exemption_limit", 
--- a/hr/doctype/employee_external_work_history/employee_external_work_history.txt
+++ b/hr/doctype/employee_external_work_history/employee_external_work_history.txt
@@ -1,75 +1,76 @@
 [
 {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:14", 
  "docstatus": 0, 
-  "creation": "2012-07-03 13:29:41", 
+  "modified": "2013-01-23 17:11:20", 
  "modified_by": "Administrator", 
-  "modified": "2012-11-30 11:57:58"
+  "owner": "Administrator"
 }, 
 {
-  "istable": 1, 
-  "name": "__common__", 
  "doctype": "DocType", 
-  "module": "HR"
+  "istable": 1, 
+  "module": "HR", 
+  "name": "__common__"
 }, 
 {
+  "doctype": "DocField", 
  "name": "__common__", 
  "parent": "Employee External Work History", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "parentfield": "fields"
+  "permlevel": 0
 }, 
 {
-  "name": "Employee External Work History", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Employee External Work History"
 }, 
 {
-  "oldfieldtype": "Data", 
  "doctype": "DocField", 
+  "fieldname": "company_name", 
+  "fieldtype": "Data", 
  "label": "Company", 
  "oldfieldname": "company_name", 
-  "fieldname": "company_name", 
-  "fieldtype": "Data"
+  "oldfieldtype": "Data"
 }, 
 {
-  "oldfieldtype": "Data", 
  "doctype": "DocField", 
+  "fieldname": "designation", 
+  "fieldtype": "Data", 
  "label": "Designation", 
  "oldfieldname": "designation", 
-  "fieldname": "designation", 
-  "fieldtype": "Data"
+  "oldfieldtype": "Data"
 }, 
 {
-  "oldfieldtype": "Currency", 
  "doctype": "DocField", 
+  "fieldname": "salary", 
+  "fieldtype": "Currency", 
  "label": "Salary", 
  "oldfieldname": "salary", 
-  "fieldname": "salary", 
-  "fieldtype": "Currency"
+  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()"
 }, 
 {
-  "oldfieldtype": "Small Text", 
  "doctype": "DocField", 
+  "fieldname": "address", 
+  "fieldtype": "Small Text", 
  "label": "Address", 
  "oldfieldname": "address", 
-  "fieldname": "address", 
-  "fieldtype": "Small Text"
+  "oldfieldtype": "Small Text"
 }, 
 {
-  "oldfieldtype": "Data", 
  "doctype": "DocField", 
+  "fieldname": "contact", 
+  "fieldtype": "Data", 
  "label": "Contact", 
  "oldfieldname": "contact", 
-  "fieldname": "contact", 
-  "fieldtype": "Data"
+  "oldfieldtype": "Data"
 }, 
 {
-  "oldfieldtype": "Data", 
  "doctype": "DocField", 
+  "fieldname": "total_experience", 
+  "fieldtype": "Data", 
  "label": "Total Experience", 
  "oldfieldname": "total_experience", 
-  "fieldname": "total_experience", 
-  "fieldtype": "Data"
+  "oldfieldtype": "Data"
 }
 ]
--- a/hr/doctype/expense_claim/expense_claim.txt
+++ b/hr/doctype/expense_claim/expense_claim.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-01-10 16:34:14", 
  "docstatus": 0, 
-  "modified": "2013-01-22 14:56:02", 
+  "modified": "2013-01-23 17:11:20", 
  "modified_by": "Administrator", 
  "owner": "harshada@webnotestech.com"
 }, 
@@ -76,6 +76,7 @@
  "no_copy": 1, 
  "oldfieldname": "total_claimed_amount", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "read_only": 1, 
  "reqd": 0, 
  "width": "160px"
@@ -89,6 +90,7 @@
  "no_copy": 1, 
  "oldfieldname": "total_sanctioned_amount", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "read_only": 1, 
  "width": "160px"
 }, 
--- a/hr/doctype/expense_claim/expense_claim_list.js
+++ b/hr/doctype/expense_claim/expense_claim_list.js
@@ -17,8 +17,7 @@ wn.doclistviews['Expense Claim'] = wn.views.ListView.extend({
 		this._super(data);
 		data.posting_date = wn.datetime.str_to_user(data.posting_date);
 		data.employee_name = data.employee_name + ' claimed '
-			+ wn.boot.company[data.company].default_currency + ' '
-			+ fmt_money(data.total_claimed_amount);
+			+ format_currency(data.total_claimed_amount, erpnext.get_currency(data.company));
 	},
 	
 	columns: [
@@ -31,8 +30,8 @@ wn.doclistviews['Expense Claim'] = wn.views.ListView.extend({
 		{
 			width: '12%',
 			content: function(parent, data) {
-				$(parent).html(wn.boot.company[data.company].default_currency
-					+ ' ' + fmt_money(data.total_sanctioned_amount));
+				$(parent).html(format_currency(data.total_sanctioned_amount, 
+					erpnext.get_currency(data.company));
 			},
 			css: {'text-align': 'right'},
 		},
--- a/hr/doctype/expense_claim_detail/expense_claim_detail.txt
+++ b/hr/doctype/expense_claim_detail/expense_claim_detail.txt
@@ -1,80 +1,80 @@
 [
 {
-  "owner": "harshada@webnotestech.com", 
+  "creation": "2013-01-10 16:34:14", 
  "docstatus": 0, 
-  "creation": "2012-07-03 13:30:39", 
+  "modified": "2013-01-23 17:11:20", 
  "modified_by": "Administrator", 
-  "modified": "2012-12-05 14:22:03"
+  "owner": "harshada@webnotestech.com"
 }, 
 {
-  "istable": 1, 
-  "name": "__common__", 
  "doctype": "DocType", 
-  "module": "HR"
+  "istable": 1, 
+  "module": "HR", 
+  "name": "__common__"
 }, 
 {
+  "doctype": "DocField", 
  "name": "__common__", 
  "parent": "Expense Claim Detail", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "parentfield": "fields"
+  "permlevel": 0
 }, 
 {
-  "name": "Expense Claim Detail", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Expense Claim Detail"
 }, 
 {
-  "oldfieldtype": "Date", 
  "doctype": "DocField", 
-  "label": "Expense Date", 
-  "oldfieldname": "expense_date", 
-  "width": "150px", 
  "fieldname": "expense_date", 
  "fieldtype": "Date", 
-  "reqd": 0
+  "label": "Expense Date", 
+  "oldfieldname": "expense_date", 
+  "oldfieldtype": "Date", 
+  "reqd": 0, 
+  "width": "150px"
 }, 
 {
-  "oldfieldtype": "Link", 
  "doctype": "DocField", 
-  "label": "Expense Claim Type", 
-  "oldfieldname": "expense_type", 
-  "width": "150px", 
  "fieldname": "expense_type", 
  "fieldtype": "Select", 
+  "label": "Expense Claim Type", 
+  "oldfieldname": "expense_type", 
+  "oldfieldtype": "Link", 
+  "options": "link:Expense Claim Type", 
  "reqd": 1, 
-  "options": "link:Expense Claim Type"
+  "width": "150px"
 }, 
 {
-  "oldfieldtype": "Small Text", 
  "doctype": "DocField", 
+  "fieldname": "description", 
+  "fieldtype": "Small Text", 
  "label": "Description", 
  "oldfieldname": "description", 
-  "width": "300px", 
-  "fieldname": "description", 
-  "fieldtype": "Small Text"
+  "oldfieldtype": "Small Text", 
+  "width": "300px"
 }, 
 {
-  "oldfieldtype": "Currency", 
  "doctype": "DocField", 
-  "label": "Claim Amount", 
-  "oldfieldname": "claim_amount", 
-  "width": "150px", 
-  "trigger": "Client", 
  "fieldname": "claim_amount", 
  "fieldtype": "Currency", 
-  "reqd": 1
+  "label": "Claim Amount", 
+  "oldfieldname": "claim_amount", 
+  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
+  "reqd": 1, 
+  "width": "150px"
 }, 
 {
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
  "allow_on_submit": 0, 
  "doctype": "DocField", 
-  "label": "Sanctioned Amount", 
-  "oldfieldname": "sanctioned_amount", 
-  "width": "150px", 
-  "trigger": "Client", 
  "fieldname": "sanctioned_amount", 
-  "fieldtype": "Currency"
+  "fieldtype": "Currency", 
+  "label": "Sanctioned Amount", 
+  "no_copy": 1, 
+  "oldfieldname": "sanctioned_amount", 
+  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
+  "width": "150px"
 }
 ]
--- a/hr/doctype/salary_slip/salary_slip.txt
+++ b/hr/doctype/salary_slip/salary_slip.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-01-10 16:34:15", 
  "docstatus": 0, 
-  "modified": "2013-01-22 14:57:22", 
+  "modified": "2013-01-23 17:11:20", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -325,7 +325,8 @@
  "fieldtype": "Currency", 
  "label": "Arrear Amount", 
  "oldfieldname": "arrear_amount", 
-  "oldfieldtype": "Currency"
+  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()"
 }, 
 {
  "doctype": "DocField", 
@@ -333,7 +334,8 @@
  "fieldtype": "Currency", 
  "label": "Leave Encashment Amount", 
  "oldfieldname": "encashment_amount", 
-  "oldfieldtype": "Currency"
+  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()"
 }, 
 {
  "doctype": "DocField", 
@@ -342,6 +344,7 @@
  "label": "Gross Pay", 
  "oldfieldname": "gross_pay", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "read_only": 1
 }, 
 {
@@ -351,6 +354,7 @@
  "label": "Total Deduction", 
  "oldfieldname": "total_deduction", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "read_only": 1
 }, 
 {
@@ -368,6 +372,7 @@
  "label": "Net Pay", 
  "oldfieldname": "net_pay", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "read_only": 1
 }, 
 {
@@ -375,6 +380,7 @@
  "fieldname": "rounded_total", 
  "fieldtype": "Currency", 
  "label": "Rounded Total", 
+  "options": "eval:erpnext.get_currency()", 
  "read_only": 1
 }, 
 {
--- a/hr/doctype/salary_slip/salary_slip_list.js
+++ b/hr/doctype/salary_slip/salary_slip_list.js
@@ -33,13 +33,8 @@ wn.doclistviews['Salary Slip'] = wn.views.ListView.extend({
 		{
 			width: '16%',
 			content: function(parent, data) {
-				$(parent).html(
-					(
-						data.company
-						? wn.boot.company[data.company].default_currency
-						: sys_defaults.currency
-					)
-					+ ' ' + fmt_money(data.rounded_total));
+				$(parent).html(format_currency(data.rounded_total,
+					erpnext.get_currency(data.company)));
 			},
 			css: {'text-align': 'right'},
 		},
--- a/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt
+++ b/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-01-10 16:34:15", 
  "docstatus": 0, 
-  "modified": "2013-01-22 14:47:58", 
+  "modified": "2013-01-23 17:11:20", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -55,13 +55,15 @@
  "label": "Amount", 
  "oldfieldname": "d_amount", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "read_only": 1
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "d_modified_amount", 
  "fieldtype": "Currency", 
-  "label": "Modified Amount"
+  "label": "Modified Amount", 
+  "options": "eval:erpnext.get_currency()"
 }, 
 {
  "doctype": "DocField", 
--- a/hr/doctype/salary_slip_earning/salary_slip_earning.txt
+++ b/hr/doctype/salary_slip_earning/salary_slip_earning.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-01-10 16:34:15", 
  "docstatus": 0, 
-  "modified": "2013-01-22 14:47:59", 
+  "modified": "2013-01-23 17:11:20", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -55,13 +55,15 @@
  "label": "Amount", 
  "oldfieldname": "e_amount", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "read_only": 1
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "e_modified_amount", 
  "fieldtype": "Currency", 
-  "label": "Modified Amount"
+  "label": "Modified Amount", 
+  "options": "eval:erpnext.get_currency()"
 }, 
 {
  "doctype": "DocField", 
--- a/hr/doctype/salary_structure/salary_structure.txt
+++ b/hr/doctype/salary_structure/salary_structure.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-01-10 16:34:15", 
  "docstatus": 0, 
-  "modified": "2013-01-22 14:57:22", 
+  "modified": "2013-01-23 17:11:20", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -155,6 +155,7 @@
  "label": "CTC", 
  "oldfieldname": "ctc", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "reqd": 1
 }, 
 {
@@ -234,6 +235,7 @@
  "label": "Total Earning", 
  "oldfieldname": "total_earning", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "read_only": 1
 }, 
 {
@@ -243,6 +245,7 @@
  "label": "Total Deduction", 
  "oldfieldname": "total_deduction", 
  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()", 
  "read_only": 1
 }, 
 {
@@ -256,6 +259,7 @@
  "fieldname": "net_pay", 
  "fieldtype": "Currency", 
  "label": "Net Pay", 
+  "options": "eval:erpnext.get_currency()", 
  "read_only": 1
 }, 
 {
--- a/hr/doctype/salary_structure/salary_structure_list.js
+++ b/hr/doctype/salary_structure/salary_structure_list.js
@@ -33,13 +33,8 @@ wn.doclistviews['Salary Structure'] = wn.views.ListView.extend({
 		{
 			width: '15%',
 			content: function(parent, data) {
-				$(parent).html(
-					(
-						data.company
-						? wn.boot.company[data.company].default_currency
-						: sys_defaults.currency
-					)
-					+ ' ' + fmt_money(data.net_pay));
+				$(parent).html(format_currency(data.net_pay, 
+					erpnext.get_currency(data.company)));
 			},
 			css: {'text-align': 'right'},
 		},
--- a/hr/doctype/salary_structure_deduction/salary_structure_deduction.txt
+++ b/hr/doctype/salary_structure_deduction/salary_structure_deduction.txt
@@ -1,59 +1,55 @@
 [
 {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:16", 
  "docstatus": 0, 
-  "creation": "2012-03-27 14:35:54", 
+  "modified": "2013-01-23 17:11:21", 
  "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:35:54"
+  "owner": "Administrator"
 }, 
 {
-  "section_style": "Simple", 
+  "doctype": "DocType", 
  "istable": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
  "module": "HR", 
-  "show_in_menu": 0, 
-  "version": 14, 
-  "server_code_error": " ", 
-  "doctype": "DocType"
+  "name": "__common__"
 }, 
 {
+  "doctype": "DocField", 
  "name": "__common__", 
  "parent": "Salary Structure Deduction", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "parentfield": "fields"
+  "permlevel": 0
 }, 
 {
-  "name": "Salary Structure Deduction", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Salary Structure Deduction"
 }, 
 {
-  "oldfieldtype": "Select", 
  "doctype": "DocField", 
-  "label": "Type", 
-  "oldfieldname": "d_type", 
-  "width": "200px", 
  "fieldname": "d_type", 
  "fieldtype": "Link", 
+  "label": "Type", 
+  "oldfieldname": "d_type", 
+  "oldfieldtype": "Select", 
+  "options": "Deduction Type", 
  "reqd": 1, 
-  "options": "Deduction Type"
+  "width": "200px"
 }, 
 {
-  "oldfieldtype": "Currency", 
  "doctype": "DocField", 
+  "fieldname": "d_modified_amt", 
+  "fieldtype": "Currency", 
  "label": "Amount", 
  "oldfieldname": "d_modified_amt", 
-  "fieldname": "d_modified_amt", 
-  "fieldtype": "Currency"
+  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()"
 }, 
 {
-  "oldfieldtype": "Check", 
  "doctype": "DocField", 
+  "fieldname": "depend_on_lwp", 
+  "fieldtype": "Check", 
  "label": "Depend on LWP", 
  "oldfieldname": "depend_on_lwp", 
-  "fieldname": "depend_on_lwp", 
-  "fieldtype": "Check"
+  "oldfieldtype": "Check"
 }
 ]
--- a/hr/doctype/salary_structure_earning/salary_structure_earning.txt
+++ b/hr/doctype/salary_structure_earning/salary_structure_earning.txt
@@ -1,62 +1,57 @@
 [
 {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:16", 
  "docstatus": 0, 
-  "creation": "2012-03-27 14:35:54", 
+  "modified": "2013-01-23 17:11:21", 
  "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:35:54"
+  "owner": "Administrator"
 }, 
 {
-  "section_style": "Simple", 
+  "doctype": "DocType", 
+  "hide_heading": 0, 
+  "hide_toolbar": 0, 
  "istable": 1, 
  "module": "HR", 
-  "doctype": "DocType", 
-  "show_in_menu": 0, 
-  "hide_heading": 0, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "server_code_error": " ", 
-  "version": 26, 
-  "hide_toolbar": 0
+  "name": "__common__"
 }, 
 {
+  "doctype": "DocField", 
  "name": "__common__", 
  "parent": "Salary Structure Earning", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "parentfield": "fields"
+  "permlevel": 0
 }, 
 {
-  "name": "Salary Structure Earning", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Salary Structure Earning"
 }, 
 {
-  "oldfieldtype": "Data", 
  "doctype": "DocField", 
-  "label": "Type", 
-  "oldfieldname": "e_type", 
-  "width": "200px", 
  "fieldname": "e_type", 
  "fieldtype": "Link", 
+  "label": "Type", 
+  "oldfieldname": "e_type", 
+  "oldfieldtype": "Data", 
+  "options": "Earning Type", 
  "reqd": 1, 
-  "options": "Earning Type"
+  "width": "200px"
 }, 
 {
-  "oldfieldtype": "Currency", 
  "doctype": "DocField", 
+  "fieldname": "modified_value", 
+  "fieldtype": "Currency", 
  "label": "Amount", 
  "oldfieldname": "modified_value", 
-  "trigger": "Client", 
-  "fieldname": "modified_value", 
-  "fieldtype": "Currency"
+  "oldfieldtype": "Currency", 
+  "options": "eval:erpnext.get_currency()"
 }, 
 {
-  "oldfieldtype": "Check", 
  "doctype": "DocField", 
+  "fieldname": "depend_on_lwp", 
+  "fieldtype": "Check", 
  "label": "Depend on LWP", 
  "oldfieldname": "depend_on_lwp", 
-  "fieldname": "depend_on_lwp", 
-  "fieldtype": "Check"
+  "oldfieldtype": "Check"
 }
 ]