Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,120 Commits 3 Branches 0 Tags 1 GiB
01e0d50eba
Commit Graph

311 Commits

Author SHA1 Message Date
Rucha Mahabal
cd31996b81 fix: check fee validity in a single function 2020-03-13 15:39:31 +05:30
Rucha Mahabal
200cb34ecf
Merge branch 'develop' into healthcare_refactor 2020-03-12 19:44:27 +05:30
Rucha Mahabal
05853efeb7 feat: Healthcare Domain Workspace with chart and shortcuts 2020-03-12 17:44:46 +05:30
Shivam Mishra
451382e08e feat: update desk pages 2020-03-12 16:34:34 +05:30
Rucha Mahabal
72993d6828
Merge branch 'develop' into healthcare_refactor 2020-03-12 12:52:38 +05:30
Rucha Mahabal
06d1b047e0 refactor: Healthcare Module Page 2020-03-12 12:16:23 +05:30
Rucha Mahabal
c4b2dceb01 feat: Fee Validity status (Ongoing, Expired, Completed) 2020-03-09 23:57:00 +05:30
Rucha Mahabal
27512c86ae refactor: Healthcare utils 2020-03-09 17:29:23 +05:30
Rucha Mahabal
e8bbdd5e84 fix: Lab Test Template data import failing in Lab Test Item creation 2020-03-06 13:18:56 +05:30
Rucha Mahabal
ac4199f2d7 fix (Lab Test): None TypeError in Patient Medical Record 2020-03-06 12:22:55 +05:30
Rucha Mahabal
11117810c5 fix (Vital Signs): Patient Medical Record not found 2020-03-06 12:21:18 +05:30
Shivam Mishra
0310366d5a fix (cleanup): remove incomplete dependencies data 2020-03-05 11:28:40 +05:30
Rucha Mahabal
33fec1df54 feat: Patient Registration Web Form 2020-03-03 01:13:58 +05:30
Rucha Mahabal
77e84dfc35 fix: remove deprecated Appointment Analytics Tree Grid Report 2020-03-03 00:25:50 +05:30
Rucha Mahabal
5a92b3fc99 feat: set chart for Appointment Analytics 2020-03-03 00:24:43 +05:30
Rucha Mahabal
85aab34421 feat: Patient Appointment Analytics Script Report 2020-03-02 23:14:30 +05:30
Shivam Mishra
1f151c1032 refactor: update restrict to domain data 2020-03-02 19:37:12 +05:30
Shivam Mishra
3f59af3ef1 feat: added base config for domains 2020-03-02 17:25:18 +05:30
Rucha Mahabal
9565e62e3a refactor: Clinical Procedure code 2020-03-02 12:11:38 +05:30
Rucha Mahabal
75626d63aa fix: set consumable entries on client side and not on validate 2020-03-02 11:35:59 +05:30
Rucha Mahabal
5ec7b55c3c fix: consumable total amount not set in Clinical Procedure 2020-03-02 10:17:15 +05:30
Rucha Mahabal
7c5947f041 fix: Batch not getting fetched in Clinical Procedure Item 2020-03-01 14:46:34 +05:30
Rucha Mahabal
d244ac9c3a fix: status inconsistencies in Clinical Procedure 2020-02-28 19:25:26 +05:30
Rucha Mahabal
0ed4cabb5d fix: make Clinical Procedure submittable 2020-02-28 19:24:38 +05:30
Rucha Mahabal
d76908d757 fix: Clinical Procedure Template code refactor 2020-02-28 13:30:43 +05:30
Rucha Mahabal
8c5725c799 fix: change item_code from Link to Data to avoid item not found error 2020-02-27 17:18:52 +05:30
Rucha Mahabal
61203b8701 fix: disabled Procedure Template shown as enabled in List View 2020-02-27 13:47:54 +05:30
Rucha Mahabal
e29d5c1d5b fix: Schedule Admission button not visible 2020-02-27 12:57:38 +05:30
Rucha Mahabal
a61bf44328 feat: capture symptoms, diagnosis in Table Multiselect instead of Small Text 2020-02-26 17:11:19 +05:30
Rucha Mahabal
22351adac5 refactor: Patient Encounter 2020-02-26 16:05:43 +05:30
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