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

347 Commits

Author SHA1 Message Date
Anoop
f899b3a633
fix: update linked Customer on Patient update only if Link Customer to Patient is enabled (#25921) 2021-06-03 09:24:31 +05:30
Suraj Shetty
a83d2aacd9
Merge branch 'develop' into esbuild 2021-05-18 14:48:28 +05:30
Suraj Shetty
ec6b652cd4 refactor: Rename assertEquals to assertEqual to avoid deprecation warnings 2021-05-10 09:18:25 +05:30
Faris Ansari
69eb6d476e Merge remote-tracking branch 'upstream/develop' into esbuild 2021-05-07 15:21:33 +05:30
Walstan Baptista
4a805b5622
chore: frappe.whitelist for doc methods (#25465) 2021-04-24 14:23:08 +05:30
Faris Ansari
1fe891b287 refactor: Replace Class.extend with native class 2021-04-23 08:04:00 +05:30
Syed Mujeer Hashmi
704ec132b7
feat:Inpatient Occupancy Table Editable for Healthcare Admin (#24989) 
Make Admitted datetime and  Discharge Datetime editable along with
Inaptient Occupancy Service Unit, Check_In and Check_out time.

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-04-20 16:39:46 +05:30
Rushabh Mehta
ff935b4586 fix(minor): fix dynamically changing grid properties 2021-04-13 12:09:36 +05:30
Rushabh Mehta
65f25c27b3 fix(minor): fix dynamically changing grid properties 2021-04-13 11:58:16 +05:30
Walstan Baptista
5d77f10baa
test: docs are not deleted in tearDown (#25123) 
* test: docs are not deleted in tearDown
 2021-04-03 13:38:55 +05:30
Walstan Baptista
d6360755b9
chore: frappe.whitelist for doc methods (#25068) 
* chore: frappe.whitelist for doc methods

* fix: incorrect spelling

* fix: sider issue

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-03-31 12:30:32 +05:30
Syed Mujeer Hashmi
f114da2f67
refactor: Make Discharge Schedule Date as Datetime (#24940) 
* refactor: Make Discharge Schedule Date as Datetime

Like Admitted Datetime make discharge date as discharge datetime.

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

* fix: Add patch for renaming discharge_date to discharge_datetime

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

* fix: quote style

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-03-23 17:48:25 +05:30
Marica
6ccd64c2ec
Merge pull request #24464 from sgtpepper9907/feat-make-patient-age-translateable 
feat: Make patient age translateable
 2021-03-10 10:15:38 +05:30
David Angulo
fe0f46c5b3
fix sider 2021-03-09 13:28:08 -06:00
David Angulo
06e99dfe7b
fix sider 2021-03-09 13:23:48 -06:00
David Angulo
358153b04b
fix sider 2021-03-09 13:19:12 -06:00
Rucha Mahabal
ccc80927f6
feat: Department Wise Appointment Type charges (#24572) 
* feat: Appointment Type Service Items

Co-Authored-By: muhammad <muhammadmp@users.noreply.github.com>

* fix: set practitioner service item charges mandatory on item selection

Co-Authored-By: muhammad <muhammadmp@users.noreply.github.com>

* feat: use charges from appointment type during billing

* feat: handle appointment charges priority for invoice automation

* test: patient appointment auto invoicing scenarios

* fix: sider

* fix: minor fixes

Co-authored-by: muhammad <muhammadmp@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-18 16:41:10 +05:30
Nabin Hait
9b178bcd10
fix: stock and account balance syncing (#24644) 
* fix: stock and account balance syncing

* fix: stock and account balance syncing

* fix: stock and account balance syncing

* fix: minor fix
 2021-02-16 14:57:00 +05:30
Rucha Mahabal
3237f5bb88
fix: Inpatient Medication Orders report test (#24596) 2021-02-10 16:36:49 +05:30
Nabin Hait
c4a1bb0e1c
fix: couple of travis fixes (#24554) 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2021-02-05 23:34:18 +05:30
prssanna
a3585e40f7 style: fix formatting 2021-02-01 19:50:27 +05:30
Suraj Shetty
0a8939e1c1 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-29 08:56:22 +05:30
David Angulo
e1e4810a46 feat: Make patient age translateable 2021-01-25 08:29:11 -06:00
rohitwaghchaure
13df7a0ca6
Merge pull request #24033 from ruchamahabal/patient-history-enhancements 
feat: Patient History Enhancements
 2021-01-23 18:19:16 +05:30
Rucha Mahabal
6f4ad3b73d fix: sider 2021-01-23 12:52:41 +05:30
Rucha Mahabal
cb1da4d07c fix: doctype meta not loading while setting up fields 2021-01-22 19:26:56 +05:30
Rucha Mahabal
75a93d9057 feat: fetch date field for custom doctypes 2021-01-22 15:51:25 +05:30
Rucha Mahabal
b9a21c4824 feat: added search to the Select fields dialog in Patient History Settings 2021-01-22 09:00:40 +05:30
Rucha Mahabal
a28579a130 fix: sider issues 2021-01-19 14:16:44 +05:30
Rucha Mahabal
f39cbd3a1d test: appointment booking for admission service unit 2021-01-19 13:59:03 +05:30
Suraj Shetty
bbc6bfd3c3 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-19 09:34:06 +05:30
Rucha Mahabal
20e5315480 feat: Allow selecting admission service unit in Patient Appointment for inpatients 2021-01-18 14:56:55 +05:30
Rucha Mahabal
004e51ed9f
Merge branch 'develop' into patient-history-enhancements 2021-01-15 12:09:53 +05:30
Rucha Mahabal
1873c389e5 feat: Only allow submittable doctypes for Patient Medical Record 2021-01-15 02:12:57 +05:30
Rucha Mahabal
b15a19c6e0 test: Medical Record creation for custom doctypes 2021-01-15 01:27:30 +05:30
Rucha Mahabal
060d647248 fix: travis 2021-01-15 00:19:14 +05:30
Rucha Mahabal
751719ea0d
Merge branch 'develop' into patient-history-enhancements 2021-01-14 14:08:50 +05:30
Rucha Mahabal
0f05925ff4 test: Do Not Bill Patient Encounters for Inpatients 2021-01-13 09:46:33 +05:30
Rucha Mahabal
1354197c72 feat(Healthcare Settings): Do Not Bill Patient Encounters for Inpatients 2021-01-13 09:12:50 +05:30
Rucha Mahabal
8549358708
Merge branch 'develop' into make-ipme-entries-editable 2021-01-11 15:31:08 +05:30
Jannat Patel
dcda8b9e8c
feat: Patient appointment status changes (#24201) 
* feat: patient appointment status changes

* fix: sider

* fix: sider

* fix: test status on cancel of docs and test refactor

Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-01-11 12:50:39 +05:30
Rucha Mahabal
aff3f611d3 fix: allow medication entries to be deleted from the table 2021-01-11 12:48:11 +05:30
Rucha Mahabal
7206e12c2f test: Allow Discharge despite Unbilled Services 2021-01-04 12:11:00 +05:30
Rucha Mahabal
03b25be9e9 feat: Allow Discharge despite Unbilled Healthcare Services 2021-01-04 11:16:59 +05:30
Rucha Mahabal
f2a431d866 fix: filter Therapy Types and Therapy Plan in Patient Appointment 2020-12-16 16:09:58 +05:30
Rucha Mahabal
5a8a52b9c6 fix: Therapy Type and Therapy Plan field visibility in Patient Appointment 2020-12-16 15:54:06 +05:30
Rucha Mahabal
02ebc9a11e
Merge branch 'develop' into patient-history-enhancements 2020-12-16 12:51:45 +05:30
Suraj Shetty
ada5facdf5 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-12-11 12:57:49 +05:30
Marica
d857d70a96
Merge branch 'develop' into stock-entry-for-medication-entries 2020-12-10 20:44:10 +05:30
Rushabh Mehta
fec8dba16c fix(merge): merge develop 2020-12-08 16:23:09 +05:30