Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Fee Validity fixes (#27156)

Browse Source 
* chore: update Fee Validity form labels

* fix: first appointment should not be considered for Fee Validity

* fix: Fee Validity test cases

* fix: appointment test case
This commit is contained in:
Rucha Mahabal 2021-08-26 12:15:49 +05:30 committed by GitHub
parent 1a919773d7
commit 642b4c805c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/healthcare/doctype/fee_validity/fee_validity.json
View File

@ -46,13 +46,13 @@
{ {
"fieldname": "visited", "fieldname": "visited",
"fieldtype": "Int", "fieldtype": "Int",
"label": "Visited yet", "label": "Visits Completed",
"read_only": 1 "read_only": 1
}, },
{ {
"fieldname": "valid_till", "fieldname": "valid_till",
"fieldtype": "Date", "fieldtype": "Date",
"label": "Valid till", "label": "Valid Till",
"read_only": 1 "read_only": 1
}, },
{ {
@ -106,7 +106,7 @@
], ],
"in_create": 1, "in_create": 1,
"links": [], "links": [],
"modified": "2020-03-17 20:25:06.487418", "modified": "2021-08-26 10:51:05.609349",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Healthcare", "module": "Healthcare",
"name": "Fee Validity", "name": "Fee Validity",

14
erpnext/healthcare/doctype/fee_validity/fee_validity.py
View File

@ -11,7 +11,6 @@ import datetime
class FeeValidity(Document): class FeeValidity(Document):
def validate(self): def validate(self):
self.update_status() self.update_status()
self.set_start_date()
def update_status(self): def update_status(self):
if self.visited >= self.max_visits: if self.visited >= self.max_visits:
@ -19,13 +18,6 @@ class FeeValidity(Document):
else: else:
self.status = 'Pending' self.status = 'Pending'
def set_start_date(self):
self.start_date = getdate()
for appointment in self.ref_appointments:
appointment_date = frappe.db.get_value('Patient Appointment', appointment.appointment, 'appointment_date')
if getdate(appointment_date) < self.start_date:
self.start_date = getdate(appointment_date)
def create_fee_validity(appointment): def create_fee_validity(appointment):
if not check_is_new_patient(appointment): if not check_is_new_patient(appointment):
@ -36,11 +28,9 @@ def create_fee_validity(appointment):
fee_validity.patient = appointment.patient fee_validity.patient = appointment.patient
fee_validity.max_visits = frappe.db.get_single_value('Healthcare Settings', 'max_visits') or 1 fee_validity.max_visits = frappe.db.get_single_value('Healthcare Settings', 'max_visits') or 1
valid_days = frappe.db.get_single_value('Healthcare Settings', 'valid_days') or 1 valid_days = frappe.db.get_single_value('Healthcare Settings', 'valid_days') or 1
fee_validity.visited = 1 fee_validity.visited = 0
fee_validity.start_date = getdate(appointment.appointment_date)
fee_validity.valid_till = getdate(appointment.appointment_date) + datetime.timedelta(days=int(valid_days)) fee_validity.valid_till = getdate(appointment.appointment_date) + datetime.timedelta(days=int(valid_days))
fee_validity.append('ref_appointments', {
'appointment': appointment.name
})
fee_validity.save(ignore_permissions=True) fee_validity.save(ignore_permissions=True)
return fee_validity return fee_validity

4
erpnext/healthcare/doctype/fee_validity/test_fee_validity.py
View File

@ -22,14 +22,14 @@ class TestFeeValidity(unittest.TestCase):
item = create_healthcare_service_items() item = create_healthcare_service_items()
healthcare_settings = frappe.get_single("Healthcare Settings") healthcare_settings = frappe.get_single("Healthcare Settings")
healthcare_settings.enable_free_follow_ups = 1 healthcare_settings.enable_free_follow_ups = 1
healthcare_settings.max_visits = 2 healthcare_settings.max_visits = 1
healthcare_settings.valid_days = 7 healthcare_settings.valid_days = 7
healthcare_settings.automate_appointment_invoicing = 1 healthcare_settings.automate_appointment_invoicing = 1
healthcare_settings.op_consulting_charge_item = item healthcare_settings.op_consulting_charge_item = item
healthcare_settings.save(ignore_permissions=True) healthcare_settings.save(ignore_permissions=True)
patient, medical_department, practitioner = create_healthcare_docs() patient, medical_department, practitioner = create_healthcare_docs()
# For first appointment, invoice is generated # For first appointment, invoice is generated. First appointment not considered in fee validity
appointment = create_appointment(patient, practitioner, nowdate()) appointment = create_appointment(patient, practitioner, nowdate())
invoiced = frappe.db.get_value("Patient Appointment", appointment.name, "invoiced") invoiced = frappe.db.get_value("Patient Appointment", appointment.name, "invoiced")
self.assertEqual(invoiced, 1) self.assertEqual(invoiced, 1)

6
erpnext/healthcare/doctype/patient_appointment/patient_appointment.py
View File

@ -109,9 +109,13 @@ class PatientAppointment(Document):
frappe.db.set_value('Patient Appointment', self.name, 'notes', comments) frappe.db.set_value('Patient Appointment', self.name, 'notes', comments)
def update_fee_validity(self): def update_fee_validity(self):
if not frappe.db.get_single_value('Healthcare Settings', 'enable_free_follow_ups'):
return
fee_validity = manage_fee_validity(self) fee_validity = manage_fee_validity(self)
if fee_validity: if fee_validity:
frappe.msgprint(_('{0} has fee validity till {1}').format(self.patient, fee_validity.valid_till)) frappe.msgprint(_('{0}: {1} has fee validity till {2}').format(self.patient,
frappe.bold(self.patient_name), fee_validity.valid_till))
@frappe.whitelist() @frappe.whitelist()
def get_therapy_types(self): def get_therapy_types(self):

9
erpnext/healthcare/doctype/patient_appointment/test_patient_appointment.py
View File

@ -107,14 +107,17 @@ class TestPatientAppointment(unittest.TestCase):
patient, medical_department, practitioner = create_healthcare_docs() patient, medical_department, practitioner = create_healthcare_docs()
frappe.db.set_value('Healthcare Settings', None, 'enable_free_follow_ups', 1) frappe.db.set_value('Healthcare Settings', None, 'enable_free_follow_ups', 1)
appointment = create_appointment(patient, practitioner, nowdate()) appointment = create_appointment(patient, practitioner, nowdate())
fee_validity = frappe.db.get_value('Fee Validity Reference', {'appointment': appointment.name}, 'parent') fee_validity = frappe.db.get_value('Fee Validity', {'patient': patient, 'practitioner': practitioner})
# fee validity created # fee validity created
self.assertTrue(fee_validity) self.assertTrue(fee_validity)
visited = frappe.db.get_value('Fee Validity', fee_validity, 'visited') # first follow up appointment
appointment = create_appointment(patient, practitioner, nowdate())
self.assertEqual(frappe.db.get_value('Fee Validity', fee_validity, 'visited'), 1)
update_status(appointment.name, 'Cancelled') update_status(appointment.name, 'Cancelled')
# check fee validity updated # check fee validity updated
self.assertEqual(frappe.db.get_value('Fee Validity', fee_validity, 'visited'), visited - 1) self.assertEqual(frappe.db.get_value('Fee Validity', fee_validity, 'visited'), 0)
frappe.db.set_value('Healthcare Settings', None, 'enable_free_follow_ups', 0) frappe.db.set_value('Healthcare Settings', None, 'enable_free_follow_ups', 0)
frappe.db.set_value('Healthcare Settings', None, 'automate_appointment_invoicing', 1) frappe.db.set_value('Healthcare Settings', None, 'automate_appointment_invoicing', 1)