Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions frontend/src/views/expense_claim/Form.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ import ExpensesTable from "@/components/ExpensesTable.vue"
import ExpenseTaxesTable from "@/components/ExpenseTaxesTable.vue"
import ExpenseAdvancesTable from "@/components/ExpenseAdvancesTable.vue"
import { getCompanyCurrency } from "@/data/currencies"
import { settings } from "@/data/settings"
import { useCurrencyConversion } from "@/composables/useCurrencyConversion"


Expand Down Expand Up @@ -112,7 +113,8 @@ const formFields = createResource({
companyDetails.reload()
},
})
formFields.reload()
if (settings.data) formFields.reload()
else settings.promise.then(() => formFields.reload())

useCurrencyConversion(
formFields,
Expand Down Expand Up @@ -188,6 +190,10 @@ const employeeCurrency = createResource({
};
},
onSuccess(data) {
if (!settings.data?.enable_multi_currency_expense_claim) {
expenseClaim.value.currency = companyCurrency.value
return
}
if (data?.salary_currency) {
expenseClaim.value.currency = data.salary_currency;
}
Expand All @@ -200,7 +206,8 @@ const companyDetails = createResource({
onSuccess(data) {
expenseClaim.value.cost_center = data?.cost_center
expenseClaim.value.payable_account =
data?.default_expense_claim_payable_account
data?.default_expense_claim_payable_account ||
data?.default_payroll_payable_account
},
})

Expand Down Expand Up @@ -273,6 +280,8 @@ function getFilteredFields(fields) {
"taxes_and_charges_sb",
"advance_payments_sb",
]
if (!settings.data?.enable_multi_currency_expense_claim)
excludeFields.push("currency_section", "currency", "exchange_rate")
const extraFields = [
"employee",
"employee_name",
Expand Down Expand Up @@ -475,6 +484,10 @@ function validateForm() {

function setExchangeRate() {
if (!expenseClaim.value.currency || !formFields.data) return
if (!settings.data?.enable_multi_currency_expense_claim) {
expenseClaim.value.exchange_rate = 1
return
}
const exchange_rate_field = formFields.data?.find(
(field) => field.fieldname === "exchange_rate"
)
Expand Down
6 changes: 5 additions & 1 deletion hrms/api/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ def get_hr_settings() -> dict:
allow_employee_checkin_from_mobile_app=settings.allow_employee_checkin_from_mobile_app,
allow_geolocation_tracking=settings.allow_geolocation_tracking,
prevent_self_leave_approval=settings.prevent_self_leave_approval,
enable_multi_currency_expense_claim=settings.enable_multi_currency_expense_claim,
)


Expand Down Expand Up @@ -714,7 +715,10 @@ def get_currency_symbols() -> dict:
def get_company_cost_center_and_expense_account(company: str) -> dict:
frappe.has_permission("Company", "read", company, throw=True)
return frappe.db.get_value(
"Company", company, ["cost_center", "default_expense_claim_payable_account"], as_dict=True
"Company",
company,
["cost_center", "default_expense_claim_payable_account", "default_payroll_payable_account"],
as_dict=True,
)


Expand Down
1 change: 1 addition & 0 deletions hrms/hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@
"on_update": [
"hrms.overrides.company.make_company_fixtures",
"hrms.overrides.company.set_default_hr_accounts",
"hrms.overrides.company.set_expense_claim_type_accounts",
],
"on_trash": "hrms.overrides.company.handle_linked_docs",
},
Expand Down
78 changes: 77 additions & 1 deletion hrms/hr/doctype/expense_claim/expense_claim.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,18 @@ frappe.ui.form.on("Expense Claim", {
frm.trigger("update_child_fields_label");
},

refresh: function (frm) {
refresh: async function (frm) {
if (frm.multi_currency_enabled === undefined) {
frm.multi_currency_enabled = cint(
await frappe.db.get_single_value(
"HR Settings",
"enable_multi_currency_expense_claim",
),
);
}
frm.trigger("set_employee");
frm.trigger("set_payable_account");
frm.trigger("toggle_multi_currency_fields");
frm.trigger("toggle_fields");
frm.trigger("add_ledger_buttons");

Expand Down Expand Up @@ -151,6 +162,43 @@ frappe.ui.form.on("Expense Claim", {
frm.trigger("update_child_fields_label");
},

toggle_multi_currency_fields: function (frm) {
if (frm.multi_currency_enabled) return;

frm.trigger("set_company_currency");
frm.toggle_display(["currency_section", "currency", "exchange_rate"], false);

const base_fields = {
expenses: ["base_amount", "base_sanctioned_amount"],
advances: [
"base_advance_paid",
"base_unclaimed_amount",
"base_allocated_amount",
"exchange_rate",
],
taxes: ["base_tax_amount", "base_total"],
};
for (const table in base_fields) {
base_fields[table].forEach((field) => {
frm.fields_dict[table].grid.update_docfield_property(field, "hidden", 1);
});
}
},

set_company_currency: function (frm) {
if (frm.doc.docstatus !== 0) return;

const company_currency = erpnext.get_currency(
frm.doc.company || frappe.defaults.get_default("Company"),
);
if (company_currency && frm.doc.currency !== company_currency) {
frm.set_value("currency", company_currency);
}
if (frm.doc.exchange_rate !== 1) {
frm.set_value("exchange_rate", 1);
}
},

set_exchange_rate: function (frm) {
if (frm.doc.currency) {
var from_currency = frm.doc.currency;
Expand Down Expand Up @@ -373,6 +421,10 @@ frappe.ui.form.on("Expense Claim", {

company: function (frm) {
erpnext.accounts.dimensions.update_dimension(frm, frm.doctype);
frm.trigger("set_payable_account");
if (frm.multi_currency_enabled === 0) {
frm.trigger("set_company_currency");
}
var expenses = frm.doc.expenses;
for (var i = 0; i < expenses.length; i++) {
var expense = expenses[i];
Expand Down Expand Up @@ -403,6 +455,30 @@ frappe.ui.form.on("Expense Claim", {
frm.toggle_reqd("mode_of_payment", frm.doc.is_paid);
},

set_payable_account: async function (frm) {
if (!frm.is_new() || frm.doc.payable_account || !frm.doc.company) return;

const account = (
await frappe.call({
method: "hrms.hr.doctype.expense_claim.expense_claim.get_default_payable_account",
args: { company: frm.doc.company },
})
)?.message;

if (account && !frm.doc.payable_account) {
frm.set_value("payable_account", account);
}
},

set_employee: async function (frm) {
if (!frm.is_new() || frm.doc.employee) return;

const employee = await hrms.get_current_employee(frm);
if (employee) {
frm.set_value("employee", employee);
}
},

employee: function (frm) {
frm.events.get_advances(frm);
},
Expand Down
23 changes: 19 additions & 4 deletions hrms/hr/doctype/expense_claim/expense_claim.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ def after_insert(self):
def validate(self):
validate_active_employee(self.employee)
set_employee_name(self)
self.set_company_currency_if_multi_currency_disabled()
self.validate_sanctioned_amount()
self.calculate_total_amount()
self.validate_advances()
Expand Down Expand Up @@ -488,6 +489,15 @@ def validate_account_details(self):
if not self.mode_of_payment:
frappe.throw(_("Mode of payment is required to make a payment").format(self.employee))

def set_company_currency_if_multi_currency_disabled(self):
if frappe.db.get_single_value("HR Settings", "enable_multi_currency_expense_claim"):
return

self.currency = erpnext.get_company_currency(self.company)
self.exchange_rate = 1.0
for advance in self.get("advances"):
advance.exchange_rate = 1.0

def calculate_total_amount(self):
self.total_claimed_amount = 0
self.total_sanctioned_amount = 0
Expand Down Expand Up @@ -798,17 +808,14 @@ def get_expense_claim(employee_advance: str | dict) -> Document:
employee_advance = frappe.get_doc("Employee Advance", employee_advance)

company = employee_advance.company
default_payable_account = frappe.get_cached_value(
"Company", company, "default_expense_claim_payable_account"
)
default_cost_center = frappe.get_cached_value("Company", company, "cost_center")

expense_claim = frappe.new_doc("Expense Claim")
expense_claim.company = company
expense_claim.currency = employee_advance.currency
expense_claim.employee = employee_advance.employee
expense_claim.payable_account = (
default_payable_account
get_default_payable_account(company)
if employee_advance.currency == erpnext.get_company_currency(company)
else None
)
Expand All @@ -818,6 +825,14 @@ def get_expense_claim(employee_advance: str | dict) -> Document:
return expense_claim


@frappe.whitelist()
def get_default_payable_account(company: str) -> str | None:
frappe.has_permission("Company", "read", company, throw=True)
return frappe.get_cached_value(
"Company", company, "default_expense_claim_payable_account"
) or frappe.get_cached_value("Company", company, "default_payroll_payable_account")


def get_expense_claim_advances(expense_claim, employee_advance):
advance_payments = frappe.get_all(
"Advance Payment Ledger Entry",
Expand Down
2 changes: 2 additions & 0 deletions hrms/hr/doctype/expense_claim/test_expense_claim.py
Original file line number Diff line number Diff line change
Expand Up @@ -941,6 +941,7 @@ def test_advance_in_different_currency_excluded_from_claim(self):
# explicit fetch raises a currency-specific error
self.assertRaises(frappe.ValidationError, get_advances, claim, advance.name)

@HRMSTestSuite.change_settings("HR Settings", {"enable_multi_currency_expense_claim": 1})
def test_multicurrency_claim(self):
from hrms.hr.doctype.employee_advance.test_employee_advance import (
create_advance_account,
Expand Down Expand Up @@ -1051,6 +1052,7 @@ def test_multicurrency_claim(self):
self.assertEqual(claim.base_total_claimed_amount, total_claimed_amount)
self.assertEqual(claim.total_exchange_gain_loss, 0)

@HRMSTestSuite.change_settings("HR Settings", {"enable_multi_currency_expense_claim": 1})
def test_advance_claim_multicurrency_gain_loss(self):
from hrms.hr.doctype.employee_advance.test_employee_advance import (
create_advance_account,
Expand Down
10 changes: 9 additions & 1 deletion hrms/hr/doctype/hr_settings/hr_settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"expense_approver_mandatory_in_expense_claim",
"prevent_self_expense_approval",
"unlink_payment_on_cancellation_of_employee_advance",
"enable_multi_currency_expense_claim",
"shift_and_attendance_tab",
"shift_settings_section",
"allow_multiple_shift_assignments",
Expand Down Expand Up @@ -305,6 +306,13 @@
"fieldtype": "Check",
"label": " Unlink Payment on Cancellation of Employee Advance"
},
{
"default": "0",
"description": "Allow expense claims to be raised in a currency other than the company currency",
"fieldname": "enable_multi_currency_expense_claim",
"fieldtype": "Check",
"label": "Enable Multi-Currency Expense Claims"
},
{
"default": "0",
"fieldname": "prevent_self_leave_approval",
Expand Down Expand Up @@ -381,7 +389,7 @@
"idx": 1,
"issingle": 1,
"links": [],
"modified": "2026-08-06 13:01:43.187327",
"modified": "2026-09-03 11:00:00.000000",
"modified_by": "Administrator",
"module": "HR",
"name": "HR Settings",
Expand Down
1 change: 1 addition & 0 deletions hrms/hr/doctype/hr_settings/hr_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ class HRSettings(Document):
auto_leave_encashment: DF.Check
check_vacancies: DF.Check
emp_created_by: DF.Literal["Naming Series", "Employee Number", "Full Name"]
enable_multi_currency_expense_claim: DF.Check
exit_questionnaire_notification_template: DF.Link | None
exit_questionnaire_web_form: DF.Link | None
expense_approver_mandatory_in_expense_claim: DF.Check
Expand Down
9 changes: 9 additions & 0 deletions hrms/hr/doctype/leave_adjustment/leave_adjustment.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"naming_series",
"employee",
"employee_name",
"company",
"amended_from",
"column_break_juxz",
"leave_type",
Expand Down Expand Up @@ -148,6 +149,14 @@
"fieldname": "reason_for_adjustment",
"fieldtype": "Small Text",
"label": "Reason for Adjustment"
},
{
"fetch_from": "employee.company",
"fieldname": "company",
"fieldtype": "Link",
"label": "Company",
"options": "Company",
"read_only": 1
}
],
"grid_page_length": 50,
Expand Down
1 change: 1 addition & 0 deletions hrms/hr/doctype/leave_adjustment/leave_adjustment.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class LeaveAdjustment(Document):
adjustment_type: DF.Literal["", "Allocate", "Reduce"]
allocated_leaves: DF.Float
amended_from: DF.Link | None
company: DF.Link | None
employee: DF.Link
employee_name: DF.Data | None
from_date: DF.Date | None
Expand Down
1 change: 1 addition & 0 deletions hrms/hr/doctype/leave_allocation/leave_allocation.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ frappe.ui.form.on("Leave Allocation", {

refresh: function (frm) {
hrms.leave_utils.add_view_ledger_button(frm);
hrms.leave_utils.add_leave_balance_button(frm);

if (frm.doc.docstatus === 1 && !frm.doc.expired) {
var valid_expiry = moment(frappe.datetime.get_today()).isBetween(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ def get_data():
{"items": ["Leave Encashment"]},
{"items": ["Leave Adjustment"]},
],
"reports": [{"items": ["Employee Leave Balance"]}],
}
6 changes: 3 additions & 3 deletions hrms/hr/doctype/leave_block_list/leave_block_list.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"engine": "InnoDB",
"field_order": [
"leave_block_list_name",
"leave_type",
"column_break_4",
"company",
"applies_to_all_departments",
"column_break_4",
"leave_type",
"block_days",
"add_day_wise_dates",
"leave_block_list_dates",
Expand Down Expand Up @@ -89,7 +89,7 @@
"icon": "fa fa-calendar",
"idx": 1,
"links": [],
"modified": "2026-03-26 15:04:08.140416",
"modified": "2026-07-16 18:03:24.681348",
"modified_by": "Administrator",
"module": "HR",
"name": "Leave Block List",
Expand Down
6 changes: 3 additions & 3 deletions hrms/hr/doctype/leave_control_panel/leave_control_panel.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
"field_order": [
"allocate_leaves_section",
"dates_based_on",
"company",
"leave_period",
"company",
"from_date",
"to_date",
"carry_forward",
"column_break_16",
"allocate_based_on_leave_policy",
"leave_policy",
"leave_type",
"no_of_days",
"allocate_based_on_leave_policy",
"carry_forward",
"quick_filters_section",
"branch",
"department",
Expand Down
Loading
Loading