schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix] Healthcare field and desktop icon (#15638)

Browse Source 
* Test Inpatient Record - Fix

* Test Inpatient Record - Fix

* Healthcare - Patch rename_healthcare_doctype_and_fields - Updated

* Healthcare - Desktop Icons - Updated

* Healthcare - Patch change  in healthcare desktop icons

* Healthcare Util - fix - appointments valid in fee validity

* Healthcare Settings - field label change

* Patient allow rename

* fix: remove unused variable
This commit is contained in:
Jamsheer
2018-10-10 14:44:36 +05:30
committed by Nabin Hait
parent 99c064305f
commit 14c6ab0ee9
9 changed files with 2777 additions and 2665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/healthcare/utils.py
View File

@@ -342,6 +342,8 @@ def manage_fee_validity(appointment_name, method, ref_invoice=None):
def appointments_valid_in_fee_validity(appointment, invoiced):
valid_days = frappe.db.get_value("Healthcare Settings", None, "valid_days")
max_visit = frappe.db.get_value("Healthcare Settings", None, "max_visit")
if int(max_visit) < 1:
max_visit = 1
valid_days_date = add_days(getdate(appointment.appointment_date), int(valid_days))
return frappe.get_list("Patient Appointment",{'patient': appointment.patient, 'invoiced': invoiced,
'appointment_date':("<=", valid_days_date), 'appointment_date':(">=", getdate(appointment.appointment_date)),