Saurabh 2e7a45dbb4 resolved merge conflicts

2018-04-24 11:16:13 +05:30

..

antibiotic

[domain] Healthcare (#10664)

2017-09-13 12:52:30 +05:30

appointment_type

[Feature] Add default duration and color to appointment type (#13296)

2018-03-20 12:08:44 +05:30

codification_table

Healthcare Doctypes - Docfield Clean up (#11065)

2017-10-18 12:13:15 +05:30

complaint

Healthcare Doctypes - Docfield Clean up (#11065)

2017-10-18 12:13:15 +05:30

consultation

Fixed merge conflict

2018-03-09 17:34:39 +05:30

diagnosis

Healthcare Doctypes - Docfield Clean up (#11065)

2017-10-18 12:13:15 +05:30

dosage_form

Healthcare Doctypes - Docfield Clean up (#11065)

2017-10-18 12:13:15 +05:30

dosage_strength

[domain] Healthcare (#10664)

2017-09-13 12:52:30 +05:30

drug_prescription

Healthcare Doctypes - Docfield Clean up (#11065)

2017-10-18 12:13:15 +05:30

fee_validity

Healthcare - Patient Appointment - Service unit based scheduling and booking (#13211)

2018-03-08 13:08:35 +05:30

healthcare_settings

Fixed translations and tests (#12900)

2018-02-14 17:44:06 +05:30

lab_prescription

Healthcare Doctypes - Docfield Clean up (#11065)

2017-10-18 12:13:15 +05:30

lab_test

Healthcare dashboard (#13533)

2018-04-06 10:29:23 +05:30

lab_test_groups

Healthcare Doctypes - Docfield Clean up (#11065)

2017-10-18 12:13:15 +05:30

lab_test_sample

[domain] Healthcare (#10664)

2017-09-13 12:52:30 +05:30

lab_test_template

Healthcare dashboard (#13533)

2018-04-06 10:29:23 +05:30

lab_test_uom

Healthcare Doctypes - Docfield Clean up (#11065)

2017-10-18 12:13:15 +05:30

medical_code

Healthcare Doctypes - Docfield Clean up (#11065)

2017-10-18 12:13:15 +05:30

medical_code_standard

[domain] Healthcare (#10664)

2017-09-13 12:52:30 +05:30

medical_department

[domain] Healthcare (#10664)

2017-09-13 12:52:30 +05:30

normal_test_items

Healthcare Doctypes - Docfield Clean up (#11065)

2017-10-18 12:13:15 +05:30

normal_test_template

Healthcare Doctypes - Docfield Clean up (#11065)

2017-10-18 12:13:15 +05:30

patient

Healthcare dashboard (#13533)

2018-04-06 10:29:23 +05:30

patient_appointment

resolved merge conflicts

2018-04-24 11:16:13 +05:30

patient_medical_record

Patient medical record and Consulatation (#12198)

2017-12-29 14:32:13 +05:30

patient_relation

Healthcare Doctypes - Docfield Clean up (#11065)

2017-10-18 12:13:15 +05:30

patient_service_unit

Healthcare - Patient Appointment - Service unit based scheduling and booking (#13211)

2018-03-08 13:08:35 +05:30

physician

Healthcare dashboard (#13533)

2018-04-06 10:29:23 +05:30

physician_schedule

Physician Schedule fixes (#13284)

2018-03-13 14:50:24 +05:30

physician_schedule_time_slot

[domain] Healthcare (#10664)

2017-09-13 12:52:30 +05:30

physician_service_unit_schedule

Healthcare - Patient Appointment - Service unit based scheduling and booking (#13211)

2018-03-08 13:08:35 +05:30

prescription_dosage

Healthcare Doctypes - Docfield Clean up (#11065)

2017-10-18 12:13:15 +05:30

prescription_duration

[domain] Healthcare (#10664)

2017-09-13 12:52:30 +05:30

sample_collection

Healthcare Doctypes - Docfield Clean up (#11065)

2017-10-18 12:13:15 +05:30

sensitivity

Healthcare Doctypes - Docfield Clean up (#11065)

2017-10-18 12:13:15 +05:30

sensitivity_test_items

Healthcare Doctypes - Docfield Clean up (#11065)

2017-10-18 12:13:15 +05:30

special_test_items

Healthcare Doctypes - Docfield Clean up (#11065)

2017-10-18 12:13:15 +05:30

special_test_template

Healthcare Doctypes - Docfield Clean up (#11065)

2017-10-18 12:13:15 +05:30

vital_signs

Patient medical record and Consulatation (#12198)

2017-12-29 14:32:13 +05:30

__init__.py

[domain] Healthcare (#10664)

2017-09-13 12:52:30 +05:30

healthcare.py

[domain] Healthcare (#10664)

2017-09-13 12:52:30 +05:30