Skip to content

fix: Update Batta Calculation #875

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
SherinKR merged 1 commit into from
Mar 27, 2025
Merged

fix: Update Batta Calculation #875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 18 additions & 3 deletions beams/beams/doctype/batta_claim/batta_claim.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,10 @@ frappe.ui.form.on('Batta Claim', {
frappe.ui.form.on('Work Detail', {
distance_travelled_km: function(frm, cdt, cdn) {
calculate_total_distance_travelled(frm);
set_batta_for_food_allowance(frm, cdt, cdn)
setTimeout(() => {
set_batta_for_food_allowance(frm, cdt, cdn);
calculate_batta(frm, cdt, cdn);
}, 30);
},
daily_batta: function(frm, cdt, cdn) {
calculate_total_batta(frm, cdt, cdn);
Expand Down Expand Up @@ -177,11 +180,17 @@ frappe.ui.form.on('Work Detail', {
calculate_total_distance_travelled(frm);
calculate_total_daily_batta(frm);
calculate_total_hours(frm);
setTimeout(() => {
calculate_batta(frm, cdt, cdn);
}, 30);
},
work_detail_remove: function(frm, cdt, cdn) {
calculate_total_distance_travelled(frm);
calculate_total_daily_batta(frm);
calculate_total_hours(frm);
setTimeout(() => {
calculate_batta(frm, cdt, cdn);
}, 30);
},
total_hours: function(frm, cdt, cdn) {
calculate_daily_batta(frm, cdt, cdn);
Expand All @@ -194,7 +203,10 @@ frappe.ui.form.on('Work Detail', {
from_date_and_time: function(frm, cdt, cdn) {
calculate_hours(frm, cdt, cdn);
calculate_daily_batta(frm, cdt, cdn);
set_batta_for_food_allowance(frm, cdt, cdn);
setTimeout(() => {
set_batta_for_food_allowance(frm, cdt, cdn);
calculate_batta(frm, cdt, cdn);
}, 30);
},
to_date_and_time: function(frm, cdt, cdn) {
let row = locals[cdt][cdn];
Expand All @@ -210,7 +222,10 @@ frappe.ui.form.on('Work Detail', {
}
calculate_hours(frm, cdt, cdn);
calculate_daily_batta(frm, cdt, cdn);
set_batta_for_food_allowance(frm, cdt, cdn);
setTimeout(() => {
set_batta_for_food_allowance(frm, cdt, cdn);
calculate_batta(frm, cdt, cdn);
}, 30);
}
}
});
Expand Down
4 changes: 2 additions & 2 deletions beams/beams/doctype/batta_claim/batta_claim.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"fieldname": "batta_type",
"fieldtype": "Select",
"label": "Batta Type",
"options": "External\nInternal"
"options": "Internal\nExternal"
},
{
"depends_on": "eval:doc.batta_type == \"Internal\"\n",
Expand Down Expand Up @@ -291,7 +291,7 @@
"link_fieldname": "batta_claim_reference"
}
],
"modified": "2025-03-25 11:00:55.832977",
"modified": "2025-03-27 13:44:09.312155",
"modified_by": "Administrator",
"module": "BEAMS",
"name": "Batta Claim",
Expand Down
2 changes: 1 addition & 1 deletion beams/beams/doctype/batta_claim/batta_claim.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ def calculate_batta_allowance(designation=None, is_travelling_outside_kerala=0,
'''
# Convert inputs to proper types
total_distance_travelled_km = float(total_distance_travelled_km or 0)
total_hours = float(total_hours or 0)
total_hours = total_hours or 0

# Fetch the Batta Policy for the given designation
batta_policy = frappe.get_all('Batta Policy', filters={'designation': designation}, fields=['*'])
Expand Down