Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,131 Commits 3 Branches 0 Tags 1 GiB
cd96be9993
Commit Graph

163 Commits

Author SHA1 Message Date
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
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