fix: filters and some conditions
diff --git a/erpnext/projects/report/billing_summary.py b/erpnext/projects/report/billing_summary.py
index e17a889..d6801c8 100644
--- a/erpnext/projects/report/billing_summary.py
+++ b/erpnext/projects/report/billing_summary.py
@@ -71,7 +71,7 @@
from_date = frappe.utils.get_datetime(filters.from_date)
to_date = frappe.utils.get_datetime(filters.to_date)
- if time_start <= from_date and time_end <= to_date:
+ if time_start <= from_date and time_end >= from_date:
total_hours, total_billable_hours, total_amount = get_billable_and_total_hours(activity,
time_end, from_date, total_hours, total_billable_hours, total_amount)
diff --git a/erpnext/projects/report/employee_billing_summary/employee_billing_summary.js b/erpnext/projects/report/employee_billing_summary/employee_billing_summary.js
index 87a043c..13f49ed 100644
--- a/erpnext/projects/report/employee_billing_summary/employee_billing_summary.js
+++ b/erpnext/projects/report/employee_billing_summary/employee_billing_summary.js
@@ -22,7 +22,7 @@
fieldname:"to_date",
label: __("To Date"),
fieldtype: "Date",
- default: frappe.datetime.month_start(),
+ default: frappe.datetime.add_days(frappe.datetime.month_start(), -1),
reqd: 1
},
]
diff --git a/erpnext/projects/report/project_billing_summary/project_billing_summary.js b/erpnext/projects/report/project_billing_summary/project_billing_summary.js
index 614903c..caac1d8 100644
--- a/erpnext/projects/report/project_billing_summary/project_billing_summary.js
+++ b/erpnext/projects/report/project_billing_summary/project_billing_summary.js
@@ -22,7 +22,7 @@
fieldname:"to_date",
label: __("To Date"),
fieldtype: "Date",
- default: frappe.datetime.month_start(),
+ default: frappe.datetime.add_days(frappe.datetime.month_start(),-1),
reqd: 1
},
]