Skip to content

feat: Added checkbox to exclude specific salary component amount from Journal Entry #3315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 30, 2025
Merged

feat: Added checkbox to exclude specific salary component amount from Journal Entry #3315

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fff6f0d
fix: exclude sal component which is not allowed to include in jv
iamkhanraheel Jul 7, 2025
2dcc4e6
feat: added check to exclude the salary component from jv
iamkhanraheel Jul 15, 2025
dd07997
test: add test case of exclusion of component in jv
iamkhanraheel Jul 18, 2025
bb42d38
fix: remove components marked for exclusion from accounting entries f…
AyshaHakeem Jul 30, 2025
e456a8d
refactor: multiple set_value call into one func
iamkhanraheel Jul 30, 2025
cf3c493
refactor: linter pass
iamkhanraheel Jul 30, 2025
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
Prev Previous commit
Next Next commit
refactor: multiple set_value call into one func
  • Loading branch information
@iamkhanraheel
iamkhanraheel committed Jul 30, 2025
commit e456a8da305e52ff61576c86a73c226f39931615
16 changes: 9 additions & 7 deletions hrms/payroll/doctype/salary_component/salary_component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,13 @@ frappe.ui.form.on("Salary Component", {
});

var set_value_for_condition_and_formula = function (frm) {
frm.set_value("formula", null);
frm.set_value("condition", null);
frm.set_value("amount_based_on_formula", 0);
frm.set_value("statistical_component", 0);
frm.set_value("do_not_include_in_total", 0);
frm.set_value("do_not_include_in_accounts", 0);
frm.set_value("depends_on_payment_days", 0);
frm.set_value({
formula: null,
condition: null,
amount_based_on_formula: 0,
statistical_component: 0,
do_not_include_in_total: 0,
do_not_include_in_accounts: 0,
depends_on_payment_days: 0
});
};
68 changes: 14 additions & 54 deletions hrms/payroll/doctype/salary_slip/salary_slip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,60 +356,20 @@ frappe.ui.form.on("Salary Detail", {
callback: function (data) {
if (data.message) {
var result = data.message;
frappe.model.set_value(cdt, cdn, "condition", result.condition);
frappe.model.set_value(
cdt,
cdn,
"amount_based_on_formula",
result.amount_based_on_formula,
);
if (result.amount_based_on_formula === 1) {
frappe.model.set_value(cdt, cdn, "formula", result.formula);
} else {
frappe.model.set_value(cdt, cdn, "amount", result.amount);
}
frappe.model.set_value(
cdt,
cdn,
"statistical_component",
result.statistical_component,
);
frappe.model.set_value(
cdt,
cdn,
"depends_on_payment_days",
result.depends_on_payment_days,
);
frappe.model.set_value(
cdt,
cdn,
"do_not_include_in_total",
result.do_not_include_in_total,
);
frappe.model.set_value(
cdt,
cdn,
"do_not_include_in_accounts",
result.do_not_include_in_accounts,
);
frappe.model.set_value(
cdt,
cdn,
"variable_based_on_taxable_salary",
result.variable_based_on_taxable_salary,
);
frappe.model.set_value(
cdt,
cdn,
"is_tax_applicable",
result.is_tax_applicable,
);
frappe.model.set_value(
cdt,
cdn,
"is_flexible_benefit",
result.is_flexible_benefit,
);
frappe.model.set_value(cdt, cdn, {
condition: result.condition,
amount_based_on_formula: result.amount_based_on_formula,
statistical_component: result.statistical_component,
depends_on_payment_days: result.depends_on_payment_days,
do_not_include_in_total: result.do_not_include_in_total,
do_not_include_in_accounts: result.do_not_include_in_accounts,
variable_based_on_taxable_salary: result.variable_based_on_taxable_salary,
is_tax_applicable: result.is_tax_applicable,
is_flexible_benefit: result.is_flexible_benefit,
...(result.amount_based_on_formula == 1
? { formula: result.formula }
: { amount: result.amount }),
})
refresh_field("earnings");
refresh_field("deductions");
}
Expand Down
68 changes: 14 additions & 54 deletions hrms/payroll/doctype/salary_structure/salary_structure.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,60 +337,20 @@ frappe.ui.form.on("Salary Detail", {
callback: function (data) {
if (data.message) {
var result = data.message;
frappe.model.set_value(cdt, cdn, "condition", result.condition);
frappe.model.set_value(
cdt,
cdn,
"amount_based_on_formula",
result.amount_based_on_formula,
);
if (result.amount_based_on_formula == 1) {
frappe.model.set_value(cdt, cdn, "formula", result.formula);
} else {
frappe.model.set_value(cdt, cdn, "amount", result.amount);
}
frappe.model.set_value(
cdt,
cdn,
"statistical_component",
result.statistical_component,
);
frappe.model.set_value(
cdt,
cdn,
"depends_on_payment_days",
result.depends_on_payment_days,
);
frappe.model.set_value(
cdt,
cdn,
"do_not_include_in_total",
result.do_not_include_in_total,
);
frappe.model.set_value(
cdt,
cdn,
"do_not_include_in_accounts",
result.do_not_include_in_accounts,
);
frappe.model.set_value(
cdt,
cdn,
"variable_based_on_taxable_salary",
result.variable_based_on_taxable_salary,
);
frappe.model.set_value(
cdt,
cdn,
"is_tax_applicable",
result.is_tax_applicable,
);
frappe.model.set_value(
cdt,
cdn,
"is_flexible_benefit",
result.is_flexible_benefit,
);
frappe.model.set_value(cdt, cdn, {
condition: result.condition,
amount_based_on_formula: result.amount_based_on_formula,
statistical_component: result.statistical_component,
depends_on_payment_days: result.depends_on_payment_days,
do_not_include_in_total: result.do_not_include_in_total,
do_not_include_in_accounts: result.do_not_include_in_accounts,
variable_based_on_taxable_salary: result.variable_based_on_taxable_salary,
is_tax_applicable: result.is_tax_applicable,
is_flexible_benefit: result.is_flexible_benefit,
...(result.amount_based_on_formula == 1
? { formula: result.formula }
: { amount: result.amount }),
})
refresh_field("earnings");
refresh_field("deductions");
}
Expand Down
Loading