fix(Travel Request): get currency from Employee Master's Company (#1807)

frappe · May 28, 2024 · 533b968 · 533b968
1 parent 42f984c
commit 533b968
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/hrms/hr/doctype/travel_request/travel_request.json b/hrms/hr/doctype/travel_request/travel_request.json
@@ -17,6 +17,7 @@
   "employee_name",
   "cell_number",
   "prefered_email",
+  "company",
   "column_break_7",
   "date_of_birth",
   "personal_id_type",
@@ -212,11 +213,19 @@
   {
    "fieldname": "dimension_col_break",
    "fieldtype": "Column Break"
+  },
+  {
+   "fetch_from": "employee.company",
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "label": "Company",
+   "options": "Company",
+   "read_only": 1
   }
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2024-03-27 13:10:55.378040",
+ "modified": "2024-05-24 17:09:09.480838",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Travel Request",

diff --git a/hrms/hr/doctype/travel_request_costing/travel_request_costing.json b/hrms/hr/doctype/travel_request_costing/travel_request_costing.json
@@ -29,19 +29,22 @@
    "fieldname": "sponsored_amount",
    "fieldtype": "Currency",
    "in_list_view": 1,
-   "label": "Sponsored Amount"
+   "label": "Sponsored Amount",
+   "options": "Company:company:default_currency"
   },
   {
    "fieldname": "funded_amount",
    "fieldtype": "Currency",
    "in_list_view": 1,
-   "label": "Funded Amount"
+   "label": "Funded Amount",
+   "options": "Company:company:default_currency"
   },
   {
    "fieldname": "total_amount",
    "fieldtype": "Currency",
    "in_list_view": 1,
-   "label": "Total Amount"
+   "label": "Total Amount",
+   "options": "Company:company:default_currency"
   },
   {
    "fieldname": "section_break_4",
@@ -55,7 +58,7 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2024-03-27 13:10:55.569536",
+ "modified": "2024-05-24 12:00:47.413806",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Travel Request Costing",