Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,421 Commits 3 Branches 0 Tags 1 GiB
15f4672ffa
Commit Graph

410 Commits

Author SHA1 Message Date
Rucha Mahabal
440c752529 chore: Lab Test Template form clean-up 2020-07-30 12:16:18 +05:30
anoop
5903002039 fix: exclude Cancelled appointments while Get Items in Sales Invoice 2020-07-28 21:15:54 +05:30
Rucha Mahabal
a695971596
fix: show the standard validation message 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-28 20:15:29 +05:30
Rucha Mahabal
7cbc7946af fix: validate check out and check in time for inpatient occupancy 2020-07-28 14:11:12 +05:30
bhavesh95863
bcb49e59e7
fix: Add missing translation function (#22813) 
* fix: Add missing translation function

Add missing translation function

* fix: Add missing function for translation

* fix: Add missing translation function

* fix: Add missing translation function
 2020-07-26 14:02:16 +05:30
Rucha Mahabal
1010feefe0
feat: Patient Progress Page (#22474) 
* feat: add patient progress page

* feat: patient progress sidebar

* feat: Patient Progress Charts

* feat: set up sidebar links

* feat: added heatmap chart for patient interactions

* fix: styles

* fix: add markers for max score in assessment charts

* fix(style): mobile view css

* fix: heatmap and percentage chart filters

* feat: add time span filters to line charts

* fix: make date fields mandatory in healthcare doctypes for better analytics

* fix: title and filter styles

* fix: handle null state for charts

* feat: add Patient Progress Page to desk

* feat: add date range filter to all charts

* fix: code clean-up

* fix: assign roles for Patient Progress Page

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-07-24 10:49:04 +05:30
Anoop
23481cc484
feat: Laboratory Module Enhancements (#22416) 
* feat: option to add organism count in descriptive tests
print format to accommodate descriptive test changes
fix: refactoring, clean up wip

* lab test - result based on secondary uom, result format options
lab test print - consider result format options, result legend and worksheet instructions

* feat: option to allow results blank in lab test if configured via lab test template

* fix: rename child doctypes, rename related links

* fix: field display depends on, cleanup - rename fields and variables

* fix: get from encounter popup layout, code cleanup and minor fixes

* fix: sms send dialog bug

* fix: lab test get from encounter html class name typo corrected

* fix: lab test organisms depends on condition

* fix: reorder fields - depends on fields brought together

* fix: PR review feedback, removed : separator, result formatting applied to result UOM

* fix: child table js removed

* fix: internal field require_result_value hidden, secondary uom result field type set to data

* fix: Use ORM methods instead of db.sql, code cleanup, style

* fix: create item price for lab test template if billable, code cleanup

* fix: patch rename doctypes before fields, deleted renamed child doctypes

* fix: secondary uom result calc - warn user if calculation fails

* fix: patch to insert entries into renamed child tables

* fix: codacy issues

* fix: patch duplicate error as items are already migrated in v12 migrate
organisms child table field name updated

* fix: patch a bit lenghty, added comments

* fix: patch

* fix: require_result_value flag marked hidden

* fix: code cleanup-up

* fix: patch - lab_test rename field, lab_test_group_template select option corrected

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-07-23 15:00:54 +05:30
Rucha Mahabal
8d28eacb09
chore: Exported Healthcare Module Dashboard (#22775) 2020-07-22 15:57:33 +05:30
Rucha Mahabal
6c6c36e780 fix: attribute error while cancelling patient encounter 2020-07-09 11:23:41 +05:30
Rucha Mahabal
45b01d2c02
feat: add medical coding fields to Healthcare DocTypes (#22501) 
* feat: add medical coding fields to templates

* feat: fetch medical codes from templates in forms

* fix: codacy issues

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-08 15:39:45 +05:30
Michelle Alva
5d514fe4df
fix: grammatical fixes in module onboarding (#22580) 
* fix: grammatical fixes in module onboarding

* fix: more grammatical changes for consistency

* fix: Reorder Stock Onboarding

* fix: update success message

* fix: change order of stock onboarding steps

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-08 14:25:51 +05:30
Chinmay Pai
96100e9507
chore: add standard queries hooks to whitelist (#21939) 
standard queries are used within the search widget, and now require to
be whitelisted before they can be executed through the search widget.

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

Co-authored-by: sahil28297 <37302950+sahil28297@users.noreply.github.com>
 2020-06-18 11:58:54 +05:30
Deepesh Garg
7e974c9e2c fix: Test Cases 2020-06-12 15:29:40 +05:30
Rucha Mahabal
a3dd75e77f fix: empty filters in Healthcare Charts 2020-05-28 19:03:37 +05:30
Rucha Mahabal
a18c896a56 fix: titles and order of Healthcare Onboarding steps (#21948) 
* fix(Healthcare): title and order of onboarding steps

* refactor: healthcare settings tour
 2020-05-27 12:43:44 +05:30
Rucha Mahabal
c52bbd79bf
fix(Healthcare): set company in healthcare service unit setup (#21929) 2020-05-26 17:54:46 +05:30
Rucha Mahabal
4dd6b9986f
fix(healthcare): patient vitals undefined (#21906) 2020-05-25 18:42:01 +05:30
Rucha Mahabal
316d136aca
fix(Healthcare): unhide company field in Sample Collection, add field in Rehab DocTypes (#21907) 
* fix: unhide company field in Sample Collection

* fix: add and set company field in rehab doctypes
 2020-05-25 18:41:47 +05:30
Deepesh Garg
9f963a2ac7 fix: Company query for number cards 2020-05-24 21:55:47 +05:30
Rucha Mahabal
3a6e6af84f fix: add title to validation dialog 2020-05-21 10:02:31 +05:30
Rucha Mahabal
f3a2f1fe20 fix(ip): code cleanup and translations 2020-05-21 09:27:42 +05:30
Rucha Mahabal
d9d1f442df fix: service unit validation and translation 2020-05-21 09:02:46 +05:30
anoop
94762ff4ff fix: invoiced field position, medical department field corrected in query 2020-05-21 03:08:47 +05:30
anoop
c6ee83bf12 fix: inpatient date validation removed, added role perms 
service unit defaults not set when created from tree, added validations on after_insert
 2020-05-21 02:29:02 +05:30
anoop
b53638c0a3 fix: ip-order dialogs use long text field 2020-05-21 01:34:18 +05:30
anoop
4053c46609 fix: consider only submitted docs for invoicing 2020-05-21 01:31:48 +05:30
anoop
53257833f8 feat: admission and discharge schedule detials via dialog 2020-05-21 00:55:35 +05:30
anoop
858593b96e fix: service unit create - set fields based on service unit type, added validations 2020-05-20 18:41:48 +05:30
Nabin Hait
041e31b8ba fix: added dashboard link in healthcare desk 2020-05-19 20:58:00 +05:30
Nabin Hait
4db4464123 Merge branch 'healthcare-charts-and-onboarding' of https://github.com/ruchamahabal/erpnext into ruchamahabal-healthcare-charts-and-onboarding 2020-05-19 20:53:08 +05:30
Rucha Mahabal
0c03834190
fix(minor): pass ignore_mandatory flag for Lab Test Item Creation (#21784) 2020-05-19 20:30:20 +05:30
Rucha Mahabal
df1cd0ef70 fix: update default dashboard in Healthcare Desk Page 2020-05-19 15:38:46 +05:30
Rucha Mahabal
89dab1bc25 refactor: open links in new tab in form tour 2020-05-19 13:46:06 +05:30
Rucha Mahabal
f472a19889 fix: mark onboarding steps as mandatory 2020-05-19 13:03:22 +05:30
Rucha Mahabal
0799c679d4 feat: Healthcare Onboarding 2020-05-19 12:07:23 +05:30
Rucha Mahabal
b8db275a35 feat: Department wise Patient Appointments custom chart 2020-05-19 01:46:48 +05:30
Rucha Mahabal
de3751387a refactor: Lab Tests and Clinical Procedures charts to Percentage type 2020-05-18 19:15:08 +05:30
Rucha Mahabal
5162faa7df fix: add default filters in Dashboard Charts 2020-05-18 18:59:59 +05:30
Rucha Mahabal
24477d5d06 feat: added Number Cards to Healthcare Dashboard 2020-05-18 18:15:20 +05:30
Rucha Mahabal
fb29714911 feat: Healthcare Dashboard 2020-05-18 16:28:11 +05:30
Rucha Mahabal
1ac2512c73 refactor: desk page colors and filters 2020-05-18 12:55:05 +05:30
Rucha Mahabal
53934b7e3b fix: failing test due to inpatient record 2020-05-17 22:44:19 +05:30
Rucha Mahabal
d3a5df2202 fix: codacy issues 2020-05-17 22:34:42 +05:30
Rucha Mahabal
2888e12dfc fix: vital signs title field 2020-05-17 22:23:53 +05:30
Rucha Mahabal
30314f18f7 fix: patient appointment title 2020-05-17 22:06:02 +05:30
Rucha Mahabal
40d49306d3 fix: pass ignore_mandatory flag when updating customer from patient 2020-05-17 21:46:42 +05:30
Rucha Mahabal
e83d1d221d
Merge branch 'develop' into multi_company 2020-05-17 20:02:12 +05:30
Shivam Mishra
41616d4dd8 feat: add name to fixture 2020-05-06 20:21:05 +05:30
Shivam Mishra
8cdcb965c5 feat: added dashboard fixtures for health care 2020-05-06 15:19:22 +05:30
Rucha Mahabal
98229db3ae
feat: Default Dashboard for Healthcare Workspace (#21414) 
* feat: Default Dashboard for Healthcare Workspace

* fix: patch

* Update add_healthcare_dashboard.py

* fix: failing patch test

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-05-05 16:02:16 +05:30
Rucha Mahabal
0243981f31
fix: handle exception if sending Appointment Confirmation message fails (#21569) 2020-05-04 11:08:44 +05:30
Rucha Mahabal
298c7e5be5 fix: exercise type 2020-04-29 19:23:16 +05:30
Rucha Mahabal
b4b3872ff2 feat: add create Sales Invoice option from Therapy Session 2020-04-29 17:34:36 +05:30
Rucha Mahabal
706f6b0030 fix: mark form as dirty when editing or deleting exercise card 2020-04-29 14:19:27 +05:30
Rucha Mahabal
7a0f425674 feat: create medical record for therapy sessions 2020-04-29 13:47:14 +05:30
Rucha Mahabal
708bceba6e fix: change Patient Medical Record subject fieldtype to Text Editor 2020-04-29 13:06:52 +05:30
Rucha Mahabal
9bf733d82e fix: reload procedure doc on completion 2020-04-29 11:16:34 +05:30
Anoop
b5e7ea7ab8
Merge branch 'develop' into multi_company 2020-04-28 11:38:07 +05:30
anoop
1696a2a4b9 fix: default sms text in settings - corrected field names 2020-04-27 23:44:41 +05:30
anoop
0f541cb7ab feat: set title for appointment, encounter, procedure and vitals 2020-04-27 23:42:22 +05:30
anoop
ca6f3ec977 fix: set customer name on patient update 2020-04-27 22:27:13 +05:30
anoop
256b77b463 fix: filter service unit by company 2020-04-27 20:00:27 +05:30
anoop
e30cc83591 fix: field order, minor fixes - 
patient - update customer, releated fields
patient appointment - send message
 2020-04-27 19:36:49 +05:30
Rucha Mahabal
131452ca94
fix: Lab Test Invoicing (#21435) 2020-04-27 10:52:38 +05:30
Rucha Mahabal
ec7db4f467 fix: modified timestamp conflict 2020-04-23 03:10:11 +05:30
Rucha Mahabal
d7304519e2 fix: conflicts 2020-04-23 00:52:47 +05:30
Rucha Mahabal
eaa956b994
feat(Healthcare): Rehabilitation Module (#21216) 
* feat: added rehab sub-module doctypes

* feat: rehab module

* feat: prescribe procedures in Patient Encounter

* feat: create Therapy Plan on Encounter submission

* feat: manage item for Therapy Type

* feat: book appointments, get prescribed therapies for Therapy Sessions

* feat: invoice Therapy Sessions

* feat: plan completion progress bar and exercise countsindicators

* feat: Motor Assessment Scale

* feat: add editable card view for exercise steps

* fix: add rehab in healthcare desk page

* fix: card deletion not working when child table is hidden

* feat: automatically fetch therapies according to Body Part

* fix: added tests for Therapy Type and Plan

* fix: add exercises according to body parts in Therapy Type

* fix: label for Exercise Instructions

* fix: exercise cards css

* feat: add dashboard for Therapy Plan

* feat: Patient Assessment Template and Patient Assessment

* feat: add title fields in Therapy Plan and Session

* fix: remove Motor Assessment Scale

* fix: fetch assessment description

* feat: create Patient Assessment from Therapy Session

* fix: anti pattern code

* fix: update desk page

* fix: exercise card rendering

* fix(test): filter out disabled Items in test_mapper

* fix: get stock uom from Stock Settings for Therapy Type Item creation

* fix: multiline SQL query

* fix: permissions for DocTypes

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-22 13:07:12 +05:30
Rucha Mahabal
ca1c37c56d
fix(Healthcare): remove hardcoded UOM during Item creation for Templates (#21350) 2020-04-21 12:54:07 +05:30
anoop
fdc075220d fix: minor, codacy suggestions 2020-04-16 23:05:38 +05:30
anoop
1c49a12ac2 fix: patient appointment 
auto invoicing: record payment if payment mode and amount available
test: fixes
 2020-04-16 17:00:47 +05:30
anoop
b922b292eb fix: set patient while billing, tests fixed 2020-04-16 13:01:45 +05:30
anoop
93d0c78ca5 feat: multi-company billing 
sales onvoice - filter get items based on company
utils - company filters in all get item helper methods
utils - refactor appointemnt items
 2020-04-16 13:01:43 +05:30
anoop
7ad98c95b9 company field added 2020-04-16 13:01:43 +05:30
anoop
38f0258991 feat: multi company support 2020-04-16 13:01:43 +05:30
anoop
2d2db60035 feat: multi company support 2020-04-16 13:01:43 +05:30
anoop
80ab98bf36 fix: company when creatign procedure, practitioner name added 2020-04-16 13:01:43 +05:30
anoop
9c7d45deae fix: set company while creating encounter, fields rearranged 2020-04-16 13:01:43 +05:30
anoop
82aeff0a32 fix: vitals added naimg series, minor field rearrangements 2020-04-16 13:01:43 +05:30
anoop
d4f5a6928f feat: additional customer fileds 
add customer_group, price list, currency etc.
rearrange and group fields
disable cusotmer edit after save (temp fix)
 2020-04-16 13:01:43 +05:30
Rucha Mahabal
120d0e5796 fix: Fee Validity test 2020-04-09 19:16:01 +05:30
Rucha Mahabal
d30023abac fix: failing tests 2020-04-09 16:43:13 +05:30
Rucha Mahabal
8844e95667 fix: pass ignore_mandatory flags 2020-04-08 10:04:10 +05:30
Rucha Mahabal
9d0ff961bc fix: patch and tests 2020-04-07 16:43:22 +05:30
Rucha Mahabal
0f23a304bc fix: added patch for refactored changes 2020-04-06 19:00:17 +05:30
Rucha Mahabal
ced978e192 fix: code clean up, performance improvements 2020-04-02 18:45:53 +05:30
Rucha Mahabal
cdf7189c29 fix: remove Expired status from Appointment 2020-03-27 11:30:00 +05:30
Rucha Mahabal
197165ff40 fix: codacy 2020-03-26 17:29:50 +05:30
Rucha Mahabal
42376705ab fix: don't append year if values have same year in Appointment Analytics 2020-03-26 16:02:53 +05:30
Rucha Mahabal
2cec6bd789 fix: check new patient before creating fee validity 2020-03-26 14:38:12 +05:30
Rucha Mahabal
b60979cfaa fix: show Change Item Code button only if Unit Type is billable 2020-03-25 02:10:33 +05:30
Rucha Mahabal
1900a62c54 fix: Merge branch 'develop' into healthcare_refactor 2020-03-25 02:08:42 +05:30
Rucha Mahabal
60e558a019 test: Patient Medical Record 2020-03-24 11:54:35 +05:30
Rucha Mahabal
aabcee4f8f test: Healthcare Consultation DocTypes 2020-03-24 11:54:15 +05:30
Rucha Mahabal
f67afe67ab test: Healthcare Masters 2020-03-23 12:31:13 +05:30
Rucha Mahabal
4f9a1471e4 fix: tests 2020-03-23 10:40:39 +05:30
Rucha Mahabal
0eeaad8ce7 fix: create fee validity for new patients only 2020-03-17 20:26:29 +05:30
Rucha Mahabal
2d785b7b09 fix: invoicing logic for appointments 2020-03-17 20:18:16 +05:30
Rucha Mahabal
f2574dde37 fix: set fee validity start date and set status as Completed or Pending 2020-03-17 19:28:18 +05:30
Rucha Mahabal
2f2c09bd98 fix: wrong fee validity calculation and payment fields visibility in appointment 2020-03-17 18:10:39 +05:30
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