Skip to content
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

fix: exclude advances scheduled for deduction when adjusting them aga… #2388

Closed
wants to merge 11 commits into from
Closed

fix: exclude advances scheduled for deduction when adjusting them aga… #2388

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ee53c82
fix: exclude advances scheduled for deduction when adjusting them aga…
AyshaHakeem Nov 5, 2024
e45718d
fix: exclude claimed and returned advance amounts
AyshaHakeem Nov 5, 2024
61fb3b6
fix: claim allocation issue
AyshaHakeem Nov 8, 2024
92ff1b7
chore: add test
AyshaHakeem Nov 15, 2024
36c9718
Merge branch 'develop' into fixes-new
AyshaHakeem Nov 15, 2024
bc36994
chore: add get_allocation_amount function
AyshaHakeem Nov 25, 2024
0bc9307
chore: return_amount field in advances child table
AyshaHakeem Nov 25, 2024
b93fdf9
Merge branch 'frappe:develop' into fixes-new
AyshaHakeem Nov 26, 2024
a519fb3
fix: fix test
AyshaHakeem Nov 26, 2024
b4224d6
Merge branch 'develop' into fixes-new
AyshaHakeem Nov 26, 2024
0ebe6f9
Merge branch 'develop' into fixes-new
AyshaHakeem Dec 6, 2024
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
1 change: 1 addition & 0 deletions hrms/hr/doctype/employee_advance/employee_advance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ frappe.ui.form.on("Employee Advance", {
posting_date: frm.doc.posting_date,
paid_amount: frm.doc.paid_amount,
claimed_amount: frm.doc.claimed_amount,
returned_amount: frm.doc.return_amount,
},
callback: function (r) {
const doclist = frappe.model.sync(r.message);
Expand Down
3 changes: 2 additions & 1 deletion hrms/hr/doctype/expense_claim/expense_claim.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,8 @@ frappe.ui.form.on("Expense Claim", {
row.posting_date = d.posting_date;
row.advance_account = d.advance_account;
row.advance_paid = d.paid_amount;
row.unclaimed_amount = flt(d.paid_amount) - flt(d.claimed_amount);
row.unclaimed_amount =
flt(d.paid_amount) - flt(d.claimed_amount) - flt(d.return_amount);
row.allocated_amount = 0;
});
refresh_field("advances");
Expand Down
5 changes: 3 additions & 2 deletions hrms/hr/doctype/expense_claim/expense_claim.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,7 @@ def get_advances(employee, advance_id=None):
advance.posting_date,
advance.paid_amount,
advance.claimed_amount,
advance.return_amount,
advance.advance_account,
)

Expand All @@ -515,7 +516,7 @@ def get_advances(employee, advance_id=None):

@frappe.whitelist()
def get_expense_claim(
employee_name, company, employee_advance_name, posting_date, paid_amount, claimed_amount
employee_name, company, employee_advance_name, posting_date, paid_amount, claimed_amount, returned_amount
):
default_payable_account = frappe.get_cached_value(
"Company", company, "default_expense_claim_payable_account"
Expand All @@ -534,7 +535,7 @@ def get_expense_claim(
"employee_advance": employee_advance_name,
"posting_date": posting_date,
"advance_paid": flt(paid_amount),
"unclaimed_amount": flt(paid_amount) - flt(claimed_amount),
"unclaimed_amount": flt(paid_amount) - flt(claimed_amount) - flt(returned_amount),
"allocated_amount": flt(paid_amount) - flt(claimed_amount),
},
)
Expand Down
Loading