431 Commits

Author	SHA1	Message	Date
Rucha Mahabal	63d987f345	fix: fields fetched incosistently from appointment and patient	2020-02-26 11:59:37 +05:30
Rucha Mahabal	41bd317e25	refactor: Patient Appointment status	2020-02-25 13:51:36 +05:30
Rucha Mahabal	7c66975040	feat: validate Customer creation for Patient during Appointment booking	2020-02-25 12:43:33 +05:30
Rucha Mahabal	5100e11fb6	fix: appointment reminders not working	2020-02-24 22:08:45 +05:30
Rucha Mahabal	24055e1552	refactor: Patient Appointment	2020-02-24 19:09:50 +05:30
Rucha Mahabal	ba740ff558	feat: show linked Sales Invoice in Patient Appointment after booking	2020-02-11 16:27:22 +05:30
Rucha Mahabal	4dd6f0ae9b	fix: non-empty service unit set as empty after booking appointment	2020-02-11 13:39:18 +05:30
Rucha Mahabal	50b67792ca	fix: remove check availability button from form	2020-02-03 23:45:14 +05:30
Rucha Mahabal	513b443861	fix: make check availability as the primary action button	2020-02-03 23:42:21 +05:30
Rucha Mahabal	4d9d51d91c	fix: get prescribed procedures button not working	2020-02-03 22:29:32 +05:30
Rucha Mahabal	217e1b41fb	refactor: Appointment Type, add dashboard	2020-02-03 21:55:52 +05:30
Rucha Mahabal	6ffdbcbcd7	feat: show Patient Appointment status in List View	2020-02-03 21:23:02 +05:30
Rucha Mahabal	b010988033	feat: add dashboards to Healthcare Masters	2020-02-02 23:22:02 +05:30
Rucha Mahabal	0a35b2207e	refactor: Healthcare masters	2020-02-02 23:21:18 +05:30
Rucha Mahabal	d089029bb4	fix: disabled practitioner schedule shown as enabled in list view	2020-01-31 12:32:42 +05:30
Rucha Mahabal	be29a24de5	refactor: Patient master	2020-01-29 22:22:39 +05:30
Suraj Shetty	2f67647f7b	Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations	2020-01-29 15:06:50 +05:30
Suraj Shetty	48e9bc3fc9	fix: Incorrect translation syntax	2020-01-29 15:06:18 +05:30
Rucha Mahabal	a4202d1660	fix: disabled patient shown as enabled	2020-01-29 11:33:29 +05:30
Rucha Mahabal	c7417c08ed	refactor: Healthcare Settings	2020-01-28 18:06:23 +05:30
Rucha Mahabal	0a27c98a99	fix(Healthcare): disabled Lab Test Template shown as Enabled in List View (#20378) ... * fix (Healthcare): disabled Lab Test Template shown as enabled in List View * fix: remove custom disabled button and unhide disabled field	2020-01-24 16:12:08 +05:30
Rucha Mahabal	72c3dd1d11	fix: healthcare settings registration fee NoneType error (#20395)	2020-01-24 15:50:44 +05:30
Suraj Shetty	000ac0068b	Merge branch 'develop' into rename-doc-fix	2020-01-09 13:46:08 +05:30
Khushal Trivedi	e3c05290c8	fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req (#19691)	2019-11-29 17:00:09 +05:30
Gavin D'souza	5a31e22892	chore: frappe.rename_doc update	2019-11-06 17:03:12 +05:30
Mohamud Amin Ali	871193eb62	fix: removed annotations altogether for bmi	2019-10-20 11:50:15 +03:00
Mohamud Amin Ali	02279dff31	fix: appropriate annotations in BMI	2019-10-20 10:46:45 +03:00
Mohamud Amin Ali	43b22b4473	fix: a more legible chart for vitals	2019-10-20 10:34:39 +03:00
mudux	0d7359a826	fix: Vitals chart not diplaying	2019-10-19 11:10:42 +03:00
Himanshu	7d6f52f4ab	fix: add system user perm in patient (#19133)	2019-09-30 14:40:56 +05:30
Anurag Mishra	5a61880e6a	fix: provided delete permission (#19143)	2019-09-24 09:54:54 +05:30
rohitwaghchaure	7496548c39	fix: not able to create invoice against patient (#18858)	2019-09-05 14:48:51 +05:30
rohitwaghchaure	5aaf15d145	fix: healthcare practitioner not showing in the dropdown (#18929)	2019-09-05 14:42:28 +05:30
Jamsheer	5073ac4dcb	fix: Patient History (Patient Medical Record) (#17972) ... * Page - Patient History * Healthcare Utils - get patient vitals * Healthcare Utils - render doc as html for patient history page * Page - Patient History - prcatitioner image in time line * Page - Patient History in menu * fix - page medical history * fix: page patient_history broken img, minor fixes * fix: patient_history page, add pagination, show doc if fetched * fix: Patient Medical Record to Patient History * fix: patient history page - set route options * fix: update to code standards * fix: remove Eidt button form patient history * fix: css update to code standards * fix: Remove page medical_record	2019-07-12 12:28:34 +05:30
Anurag Mishra	841d852f41	refactor: added missing translation functions (#18143) ... * fix: Translating Error and Messages * Update erpnext/controllers/item_variant.py Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com> * Update erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>	2019-07-03 15:15:08 +05:30
Nabin Hait	34c551d9a5	fix: Missing commits from hotfix branch (#17997) ... * fix: merge conflict * fix: restored missing set_gst_state_and_state_number function * fix: style linting as per codacy * fix: Fixes related to customer/lead merging * fix: merge conflict * fix: Fixes related to customer/lead merging * fix: Assign isue/opportunity to user * fix: Assign isue/opportunity to user * fix: Replaced Invoice type by GST Category * fix: merge conflict * fix: merge conflict * fix: test cases * fix: test cases	2019-07-03 10:34:31 +05:30
Deepesh Garg	448af7bd46	fix: NoneType fixes in Lab test (#17858)	2019-06-05 20:23:23 +05:30
Nabin Hait	89206e74d0	fixed merge conflict	2019-04-11 12:31:14 +05:30
scmmishra	29dc744354	fix: healtcare unit type enable toggle	2019-03-29 19:00:45 +05:30
Faris Ansari	d77fe38513	fix: Remove no_sitemap property	2019-03-20 14:11:05 +05:30
Zlash65	fc88029d7d	fix: fix item field for clinical procedure template	2019-02-12 11:38:27 +05:30
Nabin Hait	7fc9825954	Merge pull request #16368 from ESS-LLP/pr_staging_fixes_2 ... feat: List Active Healthcare Practitioner	2019-01-29 11:52:55 +05:30
Aditya Hase	f3c22f342c	fix(unicode): Import unicode_literals in every file	2019-01-22 18:36:10 +05:30
Jamsheer	319ca86c81	fix: Test Fee Validity	2019-01-09 13:29:20 +05:30
Jamsheer	c0ac849776	fix: Helathcare Prcatitioner custom query escaped	2019-01-09 11:48:41 +05:30
Jamsheer	45c5138eaf	fix: updated options for abdomen in Vital Signs	2019-01-09 11:19:27 +05:30
Jamsheer	f2d7e3309f	fix: Patient Appointment - Calendar - status != Cancelled	2019-01-09 11:19:27 +05:30
Jamsheer	17bb0da278	fix: remove print statement	2019-01-09 11:19:27 +05:30
Jamsheer	c3804230cd	fix: Patient - Quick Entry enabled	2019-01-09 11:19:27 +05:30
Jamsheer	52ac72e63e	fix: Validate Patient Appointment	2019-01-09 11:19:27 +05:30
Jamsheer	c0097ad729	feat: Filter active Healthcare Practitioner	2019-01-09 11:19:27 +05:30
Jamsheer	fb7b5292b3	fix: Clinical Procedure - consume stock if items present	2019-01-09 11:19:27 +05:30
Jamsheer	3e01891e22	fix: Traverse note from procedure prescription to appointment	2019-01-09 11:19:27 +05:30
Jamsheer	f3c4f5a901	fix: Clinical Procedure - copy fields from appointment	2019-01-09 11:19:26 +05:30
Jamsheer	f4d0fcb836	fix: patient - user welcome email configuration	2019-01-09 11:19:26 +05:30
Jamsheer	b2c9268ece	fix: Patient Appointment - Calendar - set color from appointment type	2019-01-09 11:19:26 +05:30
Nabin Hait	78d9fac0ce	Merge branch 'staging-fixes' into pr_staging_fixes	2018-11-26 20:25:34 +05:30
Jamsheer	64e42e1e88	fix: Patient Appointment - update list view	2018-11-19 13:00:49 +05:30
Jamsheer	ee6b317ab5	fix: Patient Appointment - Code standards	2018-11-19 13:00:49 +05:30
Jamsheer	45695c9bcb	fix: Realign Patient Appointment fields	2018-11-19 13:00:49 +05:30
Jamsheer	dc3ae114cd	feat: Reschedule - Patient Appointment	2018-11-19 13:00:49 +05:30
Jsukrut	b9a95e29b7	[FIX][#15018][PATIENT Relation should be unique]	2018-11-16 11:30:12 +05:30
Tyler Matteson	d14e46ef02	Doctypes in domains that are in beta are now restricted to that domain ... non-profit, agriculture, healthcare, hospitality, education Please enter the commit message for your changes. Lines starting	2018-11-04 08:39:52 -05:00
Ameya Shenoy	961849beb4	Merge branch 'master' into staging-fixes	2018-10-31 13:43:12 +00:00
Shreya Shah	305c82bd8d	fix(medical-record): Remove z-index property (#15790)	2018-10-31 18:02:55 +05:30
Ameya Shenoy	102eb998ac	fix(patch): reload healthacre doctypes ... Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>	2018-10-15 17:40:02 +05:30
Ranjith Kurungadam	741bd29b74	fix: Patient Appointment Calendar (#15684)	2018-10-15 14:52:38 +05:30
Jamsheer	14c6ab0ee9	[fix] Healthcare field and desktop icon (#15638) ... * 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	2018-10-10 14:44:36 +05:30
Jamsheer	063cf9c582	Jam staging fixes (#15608) ... * Test Inpatient Record - Fix * Test Inpatient Record - Fix	2018-10-08 10:48:42 +05:30
Ameya Shenoy	ad908779be	Merge branch 'master' into staging-fixes	2018-10-05 08:54:58 +00:00
Shreya Shah	17ac38ff29	Enable save before saving to update form after save (#15579)	2018-10-05 11:51:13 +05:30
Jamsheer	be6e426fe0	Healthcare Service Unit - added company abbr as suffix (#15590)	2018-10-05 11:38:15 +05:30
Nabin Hait	63a58a6752	Merge branch 'staging' into develop	2018-09-18 11:44:42 +05:30
Jamsheer	c07e8e5b0d	[Fix] Healthcare minor fixes and field rename (#15413) ... * Healthcare practitoiner in Clinical Procedure * Insert and Update Patient Medical Record from Healthcare DocTypes * vital signs remove extra columns * Rename Healthcare Field test_name * Healthcare Util - get_drugs_to_invoice - fix * Rename Healthcare Field test_code * Rename Healthcare Field test_comment * Rename Healthcare Field test_created * Rename Healthcare Field test_template * Rename Healthcare Field test_rate * Rename Healthcare Field test_description * Rename Healthcare Field test_groups * Rename Healthcare Field test_group * Rename Healthcare Field test_template_type * Rename Healthcare Field test_uom * Rename Healthcare Field test_normal_range * Rename Healthcare Field test_event * Rename Healthcare Field test_prescription * Rename Healthcare Field test_particulars * Patch - Rename healthcare fields * Sales Invoice - Filter updated for get drugs to invoice * Patient Appointment - fix - get_event	2018-09-18 10:54:03 +05:30
Zarrar	ada13213c0	reload Patient Appointment doctype with added fields (#15397)	2018-09-14 15:32:04 +05:30
Jamsheer	ede924c4a2	Remove print statements - Healthcare utils (#15363)	2018-09-11 17:32:52 +05:30
Nabin Hait	2ce2d2ac02	fix(sales invoice): get value only if field exists	2018-09-10 13:16:25 +05:30
Sagar Vora	538100148f	[py3] print, StringIO import, and other fixes	2018-09-07 17:59:59 +05:30
Jamsheer	34e561876a	Test prescription in Sales Invoice - Patient Encounter in draft status	2018-09-03 11:26:19 +05:30
Jamsheer	0640b4794e	Healthcare Practitioner - dashboard - updated	2018-09-03 11:26:19 +05:30
Jamsheer	a3b76fa40e	Healthcare - Masters - allow import set to 1	2018-09-03 11:26:19 +05:30
Jamsheer	b0ea297cf8	Patient Appointment - department - reqd = 0	2018-09-03 11:26:19 +05:30
Ranjith	2e48337cd4	Patient Encounter - update fields patient_name, patient_age	2018-09-03 11:26:19 +05:30
Jamsheer	a0b3e0268b	Healthcare - Doctype - field index = 1	2018-09-03 11:26:19 +05:30
Jamsheer	359bb512b4	Payment mode and Paid amount in Patient Appointment	2018-09-03 11:26:18 +05:30
Jamsheer	7cc205946c	Restrict to Healthcare	2018-09-03 11:26:18 +05:30
Jamsheer	363deb67c3	Automate - Patient Apointment Invoicing	2018-09-03 11:26:18 +05:30
Jamsheer	4371c7e492	Healthcare Service Unit - Tree View Updated	2018-09-03 11:26:18 +05:30
Jamsheer	c64880b578	Invoice - lab prescription from submitted Patient Encounter	2018-09-03 11:26:18 +05:30
Jamsheer	0ae100b035	Configuration - Create Lab Test on Sales Invoice Submit	2018-09-03 11:26:18 +05:30
Jamsheer	61574d18bf	Fix - Create Multiple Lab Test from Sales Invoice or from Patient Encounter	2018-09-03 11:26:18 +05:30
Jamsheer	858e026fc0	Lab Test - Create Multiple from Sales Invoice or from Patient Encounter	2018-09-03 11:26:18 +05:30
Jamsheer	80468bec31	Lab Test - Remove unused methods	2018-09-03 11:26:18 +05:30
Jamsheer	2ae06d3a35	Healthcare Service Unit - rename field - occupied to occupancy status	2018-09-03 11:26:18 +05:30
Jamsheer	b19993b5bc	Codacy - fixes	2018-09-03 11:26:18 +05:30
Jamsheer	25dda3a91a	Invoice inpatient occupancy - Qty updated	2018-09-03 11:26:18 +05:30
Jamsheer	9b9518eaaa	Healthcare Service Unit Type - Validation and Item price updation	2018-09-03 11:26:18 +05:30
Jamsheer	c8f827be66	Healthcare Service Unit Type - Field - UOM Conversion in Hours	2018-09-03 11:26:17 +05:30
Jamsheer	ee5f9c7b80	Healthcare Invoice - Practitioner Specific Service Item	2018-09-03 11:26:17 +05:30
Jamsheer	e1d215352b	Healthcare Practitioner - Service Item Fields - Filter and Validation	2018-09-03 11:26:17 +05:30
Jamsheer	1dbfd5c1e7	Healthcare Settings - Heathcare Service Item - Validation	2018-09-03 11:26:17 +05:30
Jamsheer	e82f27ac10	Healthcare - Invoice Drug Prescription	2018-09-03 11:26:17 +05:30
Jamsheer	197cd88d36	Lab Test Template - rate updation - fix	2018-09-03 11:26:17 +05:30
Jamsheer	8da6f4e30c	Healthcare - Invoice - Redesign	2018-09-03 11:26:17 +05:30
Jamsheer	25e535c66f	Clinical Procedure Item - Remove field invoiced	2018-09-03 11:26:17 +05:30
Jamsheer	1646010059	Clinical Procedure - Consumables Invoice Separately	2018-09-03 11:26:17 +05:30
Jamsheer	0eb64ca38b	Healthcare Settings - Filter For Service Items	2018-09-03 11:26:16 +05:30
Jamsheer	edf8821a4e	Healthcare Settings - fields - service items	2018-09-03 11:26:16 +05:30
Jamsheer	b2a615b8e8	Healthcare Practitioner - new field - Inpatient Visit Charge	2018-09-03 11:26:16 +05:30
Jamsheer	eafb046fce	Healthcare Utils - prescription - invoice - fix	2018-09-03 11:26:16 +05:30
Jamsheer	94efed161a	Fee Validity - Test - Updated	2018-09-03 11:26:14 +05:30
Jamsheer	146683bbff	Fee Validity - invoice reference	2018-09-03 11:26:14 +05:30
Jamsheer	f7a6531fb3	Inpatient Record - Test - Updated	2018-09-03 11:26:14 +05:30
Jamsheer	54ae74eb28	Inpatient Billing	2018-09-03 11:26:14 +05:30
Jamsheer	8cb142bf29	Field Changes - Healthcare Invoice Work Flow Redesign	2018-09-03 11:26:14 +05:30
Jamsheer	bab55390f8	Sales Invoice in Patient Dashboard	2018-09-03 11:26:14 +05:30
Jamsheer	ba11972302	Healthcare Service - Invoice Work Flow - Redesign	2018-09-03 11:26:14 +05:30
Shreya Shah	a5add289bb	Refactor Naming Series (#15070) ... * Patch to create Property Setter for existing naming series * Update existing naming series options with new * Add patch link to patches.txt * Update patch * Fix codacy * Fix as per suggestions * Remove old patch for property setter * Improve as per suggested - Modified the naming - Also refactored naming for doctypes having autoname with series - Added a patch to make property setter for autoname * Fix Travis * Rebase with develop	2018-08-28 13:44:48 +05:30
Faris Ansari	4809f86035	fix(report): field -> fieldname, dateutil -> frappe.datetime (#15106)	2018-08-14 10:56:18 +05:30
Rushabh Mehta	708e47aadf	optimize(various)	2018-08-08 16:37:31 +05:30
Saurabh	824b388631	Resolved merge conflicts	2018-08-07 13:01:11 +05:30
Shreya Shah	11dd3ffdb5	Force delete item on deletion of Lab test template (#15079)	2018-08-06 14:43:00 +05:30
rohitwaghchaure	dc7004e083	[Fix] Patient Appointment Calendar not showing data properly (#15052)	2018-07-31 16:01:02 +05:30
mist-01	9821d51e31	Updated appointment availability to consider appointment duration in healthcare domain (#15011) ... * Updated appointment availability to consider appointment duration in healthcare domain. Fix bug - must clone moment before adding time to avoid updating original moment * Add spaces after comments	2018-07-27 11:02:03 +05:30
Ranjith Kurungadam	e51c175aca	Fix tests (#14991) ... * minor improv in fetching account * pass name field while creating tds doc * create tds fixture after creating tds account * Inpatient Record - Test - Fix * fix batch query	2018-07-24 11:07:28 +05:30
Jamsheer	425fb4c5f4	[Feature][Enhance] Healthcare Inpatient (#14940) ... * New DocTypes - Inpatient Record and Healthcare Service Unit Type * Patient Appointment - Button - Get Prescribed Procedure - hide after save * Patient Encounter - Schedule Inpatient button * Inpatient - Healthcare Fields and references Conflicts: erpnext/healthcare/doctype/lab_test/lab_test.json erpnext/healthcare/doctype/patient_appointment/patient_appointment.json erpnext/healthcare/doctype/patient_encounter/patient_encounter.json erpnext/healthcare/doctype/vital_signs/vital_signs.json * Healthcare Service Unit Type - Item Creation - UOM Fix * Healthcare Service Unit - healthcare service unit type fix * Inpatient Record - Admission Scheduled and Discharge Scheduled status * Patient - rename field inpatient to inpatient_status * Inpatient Record - rename field inpatient to status * Refactor - Inpateint Occupancy * Remove unused imports * Healthcare service unit - patch - fix * Healthcare IP - Codacy Fix * Inpatient Record - Encounter and Practitioner References * Patch - add healthcare service unit tree - enhance * Healthcare Setup - Remove - Lab Test and Item creation * Discharge note in Inpatient Record * Codacy fix * Inpatient Record - Update transfer service unit filter * Inpatient Record - Test	2018-07-23 13:05:35 +05:30
Jamsheer	f926911399	[Enhance][Fix] Healthcare - DocType and Fields renaming (#14861) ... * Rename DT - Physician Schedule Time Slot to Healthcare Schedule Time Slot * Role name change * Rename DT - Physician Schedule to Practitioner Schedule * Rename DT - Physician Service Unit Schedule * Rename DT - Physician to Practitioner * Lab Test Template - field disabled in standard filter * Patient - customer creation fix * Rename DT - Consultation - Encounter * Patches.txt updated for rename doctypes and fields in Healthcare * Patch - Rename doctypes and fields in Healthcare Domain * Fix - Patch - rename_healthcare_doctype_and_fields * Vital Signs - New Fields - Abdomen, Tongue and Reflexes * Web Form - Patient - Personal Details * Rename DocType Physician to Healthcare Practitioner * Rename DocType Consultation to Patient Encounter * Web Form - Personal Details - Fix * Web Form - Personal Details - Codacy Fix * Healthcare patch run for all domain * Rename label Practitioner to Healthcare Practitioner * Rename Encounter to Patient Encounter	2018-07-16 18:08:53 +05:30
Tom Price	32c984cd3c	Fix fields being hidden by default. (#14490) ... Modify the title property to be sensible for general usage, unique and translatable. Add allow_in_quick_entry properties appropriately.	2018-06-13 11:14:44 +05:30
Jamsheer	0ca76323af	Clinical Procedure Template - get_item_details - fix (#14449)	2018-06-11 17:25:49 +05:30
Rohit Waghchaure	cdec44ee81	Removed company data from test item records	2018-06-11 13:32:34 +05:30
rohitwaghchaure	8fc64a9717	[Fix] Travis data (#14422)	2018-06-08 14:43:50 +05:30
Saurabh	0eb622f7da	[fix] resolve conflicts	2018-05-31 17:32:17 +05:30
Nabin Hait	153536bf70	minor test fixes	2018-05-29 10:58:57 +05:30
Nabin Hait	33df0b4fbf	Test case fixes (#14219) ... * Test case fixes * fetch_from fixes	2018-05-26 09:09:02 +05:30
Ranjith Kurungadam	27cf190269	healthcare fix - str encode to utf-8 (#14213)	2018-05-24 17:15:22 +05:30
Zarrar	c141eb00ee	[Enhance] Department added wherever applicable (#14121) ... * set All Department as default parent_department * add department field in employee_transfer * copied data from options to fetch_from * add department field wherever employee's link field present * empty options field where fetch_from is added	2018-05-23 11:11:36 +05:30
Shreya Shah	1906cadd94	[Fix] Currency field in Pricing rule (#14004) ... * some minor changes * Set query for price list based on currency * Validate Price list with currency	2018-05-16 11:20:30 +05:30
Jamsheer	0cde6ae3c5	Clinical procedure (#13540) ... * Clinical Procesdure Template and Clinical Procedure Doctype * Consultation - Create procedure and procedure prescription * Patient Appointment - Create Procedure and Procedure appointment invoice * Physician Schedule - Validate slot overlap * Clinical Procedure Item - batch_no for Clinical Procedure not for Template * Clinical Procedure - manage item batch_no * Codacy - fixes * Yet another Codacy and travic-ci fix * Codacy - fixes * Clinical Procedure - Codacy fix * Permissions updated * fixed Qty Indicators, Minor fixes * Patient appointment for procedure prescription * Doctype Patient Service Unit to Healthcare Service Unit * Add healthcare service unit tree root * Healthcare Service Unit - Tree view script * Healthcare Service Unit - allow appointments check * Clinical Procedure - remove unused variable * Clinical Procedure - Get actual quantity from ledger - fix * Clinical Procedure - apply transilation for message * Warehouse in Healthcare Service Unit * Service Unit in Clinical Procedure * Codacy fix * Missing semicolon	2018-05-16 10:54:00 +05:30
Shreya Shah	ba6cb8ae4b	[Healthcare] Fix UI (#14011) ... * Fix UI * Fix Calendar View	2018-05-14 14:06:31 +05:30
Nabin Hait	abd0325acd	Fixed merge conflict	2018-05-05 12:19:14 +05:30
Jamsheer	bd63f0056a	Patient medical record updation and deletion fixes (#13891)	2018-05-04 18:13:28 +05:30
Saurabh	2e7a45dbb4	resolved merge conflicts	2018-04-24 11:16:13 +05:30
Zarrar	68a7ee22f2	order_by for gantt error fix (#13752)	2018-04-23 13:22:03 +05:30
Manas Solanki	9630aa3d7f	fixed the gantt view of patient appointment	2018-04-23 12:37:11 +05:30
Jamsheer	86fd8cbf68	Healthcare dashboard (#13533) ... * Healthcare Dashboards * Lab Test and Template - field marked in_filter = True	2018-04-06 10:29:23 +05:30
Faris Ansari	34dd079a68	Remove unnecessary columns Analytics Reports (#13344)	2018-03-22 11:12:02 +05:30
Tom Price	cd525299ee	[Feature] Add default duration and color to appointment type (#13296) ... * Add default duration and color to appointment type When creating a Patient Appointment, the Duration field will be populated when the Appointment Type is set. This is preserved when checking availability and booking an appointment. `Appointment Type.color` is used in the calendar display. * Remove accidental fixed date from git * Update modified timestamp to ensure migrations. Set to the timestamp of dd506a0961437540872c01d3487b8e37806c0bb0	2018-03-20 12:08:44 +05:30
Ranjith Kurungadam	369ba85499	Physician Schedule fixes (#13284) ... * move button add schedule to grid * Physician Schedule- add slots for multiple days * fix patient image view	2018-03-13 14:50:24 +05:30
Nabin Hait	2f493731ec	Fixed merge conflict	2018-03-12 15:49:59 +05:30
Shreya Shah	58797481f0	uncheck report hide (#13256)	2018-03-12 13:08:01 +05:30
Nabin Hait	5e63c265db	Fixed merge conflict	2018-03-09 17:34:39 +05:30
Nabin Hait	096c05ca6f	Fixes for regional feature of Nepal	2018-03-09 13:11:00 +05:30
Suraj Shetty	f2d28ebd6a	Data import Tool bug fix (#13165) ... * fixes #13064 * commonified naming series checks * test fixes replaced test employee names according to naming series	2018-03-09 12:33:13 +05:30
Ranjith Kurungadam	a3a63177a1	fix- cannot cancel consultation, remove updating age (#13226)	2018-03-08 16:20:22 +05:30
Ameya Shenoy	d2eec91b2c	indentation fix	2018-03-08 13:27:11 +05:30
Achilles Rasquinha	9efd6e80d2	fixed tabs	2018-03-08 13:20:48 +05:30
Achilles Rasquinha	987934d8ee	fixed tabs	2018-03-08 13:16:08 +05:30
Jamsheer	665b48773f	Healthcare - Patient Appointment - Service unit based scheduling and booking (#13211) ... * New Document - Patient Service Unit * Physician - schedule based on patient service unit * Consultation - Remove validation on submit * Consultation - Label changed from Drug Prescription to Medication * Availability check and book appointment based on service unit, appointment invoice creation optimized * patch fixes * Patient Service Unit - field - overlap_appointments * Patient Appointment - Service Unit based scheduling and booking * Patient Appointment - issue fixed #13016 Healthcare Patient Appointment Save Button Issue - remove validation on save and enable save on book appointment * Codacy fixes on PR #13211 * Codacy fixes on PR #13211 * Fee validity test -fixes * Fee Validity - test - fixes	2018-03-08 13:08:35 +05:30
Nabin Hait	cf72d7f135	Fixed merge conflict	2018-02-22 14:47:26 +05:30
Zarrar	5a947f38ab	avoid overlap with dropdown (#12941)	2018-02-16 12:49:30 +05:30
Nabin Hait	e6d65bc2a1	Fixed translations and tests (#12900) ... * Fixed translations and tests * minor fixes * minor test fixes	2018-02-14 17:44:06 +05:30
Shreya Shah	d9a585bdad	Leave workflow patch fixes (#12823) ... * modified patch for leave application workflow * removed leave approval field from leave application doctype * fetch lwp and attendance only if workflow field exists * modified test cases * modified files with leave application * docstatus draft for rejected applications * modified leave application calendar * test fixed * run patch only if any record exists	2018-02-12 16:02:57 +05:30
Jamsheer	be9eae06ec	Physician - Set Details by User or Employee (#12558)	2018-02-12 11:33:44 +05:30
Achilles Rasquinha	ac57c87bc3	Fixed spacing	2018-01-30 14:05:18 +05:30
Achilles Rasquinha	244dcae110	Fixed spacing	2018-01-30 14:03:59 +05:30
Jamsheer	d63b7e16af	Patient Appointment - Check appointment day is holiday or physician on leave (#12556)	2018-01-23 15:38:34 +05:30
Jamsheer	c90195de29	Patient medical record and Consulatation (#12198) ... * Patient Medical Record - Subject field reqd=0, Subject text formated * Consultation - remove patient details section * Search fields are updated for Consultation and Appointment * Translations applied on menu	2017-12-29 14:32:13 +05:30
Saurabh	b750b304dd	fixed merge-conflicts	2017-11-28 11:02:28 +05:30
Jamsheer	b488475d92	Remove Company from Patient - Patches Added (#11716) ... * Remove Company from Patient - Patches Added * Update patient DOB field label to Date of birth * Patient marital status default null * Update patient.py	2017-11-28 10:47:06 +05:30
Manas Solanki	966f141f62	Rename schools to Education (#11524) ... * renaming for the docs, demo data and patch * changes in the doctypes and reports * rename the config file * Few name changes in messages and license * rename the school settings to education settings * changes in the documentation * added the setup file for the fixtures * corrected the ui tests file path * fix the codacy * add the patch for renaming few doctypes and fields * changes in the patch	2017-11-23 15:22:10 +05:30
Jamsheer	1ce56316ea	Populate patient_name in Healthcare Doctypes (#11690) ... * On Cancel Consultation - Open Appointment - Delete Medical Record * Add Filter on Account Selection - is_group: 0 * Patient Medical Record - List view Fixes * Update consultation.py * Set Appointment Refrence in Vital Signs * Add Other in Gender Selection * Populate patient_name in Healthcare Doctypes	2017-11-23 12:18:43 +05:30
Jamsheer	0abec034df	Healthcare hotfix (#11586) ... * On Cancel Consultation - Open Appointment - Delete Medical Record * Add Filter on Account Selection - is_group: 0 * Patient Medical Record - List view Fixes * Update consultation.py	2017-11-15 13:53:50 +05:30
Jamsheer	bab226698f	Healthcare hotfix (#11574) ... * Patient dashboard - Vital Signs * Remove submit validation in Consultation * Physician Schedule - Add Time Slots - Fix * Patient Appointment - Client side - fixes	2017-11-15 09:47:00 +05:30
Nabin Hait	aa7896f1e1	[test] Fixed physician test cases (#11347)	2017-10-26 14:33:28 +05:30
Nabin Hait	fb734976eb	Removed appintment field from Invoice, it should be a custom field and will be added from domain settings	2017-10-25 15:53:07 +05:30
Saurabh	5fa2adcca9	Merge branch 'master' into develop	2017-10-18 16:23:44 +05:30
Ranjith Kurungadam	7624e7bf85	[hot-fix] sql getting translated (#11243) ... * fix remove _ in frappe.sql * use %s replacement for sql	2017-10-18 15:48:12 +05:30
Jamsheer	dd7c1b87c5	Healthcare Doctypes - Docfield Clean up (#11065) ... * Healthcare Doctype Clean up - updated index, in_filter, no_copy and ect. * Healthcare Doctype - remove frappe import	2017-10-18 12:13:15 +05:30
Rushabh Mehta	bc4e2cd9c1	[added] hospitality domain (#11020) ... * [added] hospitality domain * [tests] wip * [tests] for restaurant * [fix] tests for new naming * [docs] added restaurant docs * [docs] added restaurant docs	2017-10-17 12:30:34 +05:30
tundebabzy	7f9d75521e	Confirmation desired before cancelling appointment (#10996) (#11106) ... * shows confirm dialog when user clicks cancel * indentation and frm as per review	2017-10-09 12:43:18 +05:30
Rushabh Mehta	f056974bc5	[domain] Healthcare (#10664) ... * Medical module for erpnext * Changes in core for Medical module * patient registration updated * fix - appointment invioce - fields missing * pages- indicator instead of bg-color * Lab Test field renamed service type * Department added Lab Test * procedure name in prescription * fixes sample collection * filter disabled patient * fix patient admission * updated patient age * availability check msg updated * fixes, removed procedure from invoice * sample print renamed * fixes, validation * service desk physician in filter * refactor scheduler * Appointment -field property - set only once = 1 * Appointment - Mark closed and pending buttons removed * Appointment - readonly = 1 if value set * Appointment - availabilty * Appointment - Cancel - info - cancel invoice * Appointment - set pending appointments * Dosage form - new DT * Drug Prescription - Dosage form added * Facility - Floor - removed from Fecility * Floor - removed * Lab Test Template - item creation validation * Procedure - Create Procedure * Procedure Appointment - new DT * Service Unit - Floor reference removed * Zone Fcilities - Unused DT removed * Appointment Desk - fixed * Service Desk - method pointing from procedure changed to procedure_appointment * Consultation print - got featured * Consultation - removed patient refernce to procedure prescription * Procedure Prescription - removed patient refernce * Lab Test - Changed field properties and value * Lab Test - field property changed * Lab Test - methods rewrite - lab test doc creation * Lab Test - create lab test from invoice and consultaion - got changed * Button History changed to Medical Record * Service Desk - Updated * Notification - Procedure Appointment * fix-get procedure prescription * fix field added to test prescription * msgprint on invoice creation * fix data on install * Merge branch erpnext/develop * fixes- minor * Setup wizard - Create Sensitivity * Appointment - Validate and Save if there is no schedule for Physician * Consultation - Button create vital signs and medical record * Review Type - New DocType * Review Detail and Treatment Plan - Childs - Consultation * Patient Medical Record - field Attach doc * Consultation - New Fields * Consultation - Manage new Fields - Medical record add action * Patient Relation - Child DocType - Patient * Patient - Patient Relation added * Patient - collapsible = 1 * Laboratory Settings - fields - message for lab test * Laboratory Settings - get message for lab test * SMS text for lab test and invoice test report * Procedure Stock Detail - Stock detail for Procedure and Template * Template Stage Detail - Stage detail for Procedure Template * Procedure Stage Detail - Stage detail for Procedure * Service Unit - field - warehouse * Scheduler - msg - content changed * Laboratory Settings - defualt - msg content * Invoice Test Report - msg print * Print Format-Changed-Consultation-Invoice Test Report-Lab Test * OP Settings - Expnse Account for Stock Entry in Procedure * Procedure and Procedure Template - Manage Stock Stage and Sample Collection * Procedure Appointment - Manage Stock and Stage * Lab Test - fixed - resource not find * Invoice Test Report - fixed - resource not find * Procedure - doc reload after insert * Patient Medical Record - fixed - refernce missed * Create Vital Signs -on client side * Rename module Medical to Healthcare * Remove In Patient (IP) Feature. * Rename - Procedure to Clinical Procedure * Remove spaces in Naming Series * Rename Duration to Drug Prescription Duration * Duration to Drug Prescription Duration * Merge All Settings to Healthcare Settings * Healthcare settings - import fixed * Procedure related documents are removed * Appointment Desk and Sevrvice Desk are removed * Consultation - minimal * Consultation - minimal * Consultation - minimal - patient detials in collapsible section * Message Print to Alerts * Patient - some fields removed * Patient - create consultation - message print to alerts * Consultation - show patient details updated * Setup wizard - Duration to Drug Prescritpion Duration * Healthcare Settings - patient registration - fee collection * Lab Test - Create Sales Invoice bug fixed * Healthcare menu rearranged * Healthcare Settings - Optimised and Rearragnged * Healthcare Settings - Expense account removed * Receivable account removed from patient * Patient - Optimised and Rearragnged * Removed Referring Physician * Healthcare Settings - bold headings removed * Physician - Patient - Fields are Segregated * Remove Service Unit * Remove - Service Type * Consultation invoice * Lab Test - invoice * Patient - Invoice * Rename Appointment to Patient Appointment * wip * Patient Dashboard, Physician Form cleanup * Dosage renamed to Prescription Dosage * Renamed Drug Prescription Duration to Prescription Duration * Patient Appointment booking modal * Patient Age - calculate by dob * Remove - scheduler * Consultation - Appointment to Patient Appointment * Patient Dashboard - rearranged * Patient Appointment * Removed rer_physician from lab test and consultation * Patient Appontment Changes * Appointment and Consultation - optimized * Patient Appointment - fee validity code optimized * Consultation and Patient Appointment - Invoice validate two side * fix: #13 remove relation to admission * Healthcare - Patient Portal * fix import error * domain Healthcare added on install * Removed - Invoice Test Report * Physician Schedule - menu * Consultation - patient details - re write * New Doctype-Medical Code * Consultation - Daignosis codification * Medical Code - Codification - Settings * Medical Code Standard - Medical Code - Codification - Settings * fix appointment calendar * fix appointment analytics * Menu Medical Code Standard * New Doctype - Medical Code Standard * Set Physician Role insted of IP Physician and OP Physician Role * fixed some json files * Medical code - permission to physician * Unused Childs - Work Schedule and User List - Removed * Label Procedure to Lab Test * Lab Test and Patient - code optimised * Add Item Groups - setup wizard * Healthcare Settings - add Role - Medical Administrator * Healthcare - Demo setup - Make Demo * Fee Validity - Logic Test * Test Fee Validity - Optimised * Healthcare Doctypes - Restricted to Domain Healthcare * Domainify - remove Healthcare Roles - Other Domains * Healthcare doctypes - beta checked * Codacy fixes * Codacy - fixes * Codacy - fixes * Codacy - fixes * Codacy - fixes * Codacy - fixes * Lab Test - print hide =1 for some fields * Consultation - Codification field label to Medical Coding * Codacy fixes - import frappe and etc. * Codacy fixes - import frappe in test_vital_signs * Codacy fixes * Codacy fixes * Codacy fixes and remove delete perm for patient * send_sms - import form frappe * Healthcare Settings * Lab Prescription - Consultation - Test Code - read_only = 0 * Portal fixes * Patient Appointment - filter physician - if has schedule * Physician - IP Charge - Removed * test - files * Web Form - Patient Profile - removed * Role Medical Administrator to Healthcare Administrator * WIP healthcare documentation * Coday - fixes * Travis - fixes * Lab Test Report - menu * Reorder Healthcare settings - group lab config to bottom * Sample Collection - New - allow Sample and patient Selection * Rate - similar behaviour and Label as in Item Standard Selling Rate * Healthcare documentation * Lab Test Samples to Lab Test sample * Commplaints to Complaint * Commplaints to Complaint * Antibiotics to Antibiotic * Appointment Token Number - remove * View - Medical record * Codacy fixes * update healthcare docs * Cleanup Docs - Search, quick entry, trsck change, etc. * [minor] ux changes	2017-09-13 12:52:30 +05:30