Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
577 commits
Select commit Hold shift + click to select a range
a2d7cf0
fix: order of column in dialog box
viralkansodiya Jul 1, 2025
b73bfe0
Merge pull request #99 from FOSS-ERP/biograph
tactentech Jul 1, 2025
c156bfb
Merge pull request #100 from FOSS-ERP/biograph-staging
tactentech Jul 1, 2025
adae18c
feat: Enchanced Clinical Note Functionality in Patient Encounter, The…
bibinprofessional Jul 2, 2025
e828a0a
fix: appointment status issue
viralkansodiya Jul 3, 2025
874adeb
Merge pull request #101 from FOSS-ERP/fix-status-appointments
tactentech Jul 3, 2025
4825291
fix: appointment status issue
viralkansodiya Jul 3, 2025
10f13d9
Merge pull request #102 from FOSS-ERP/biograph-staging
tactentech Jul 3, 2025
5a7f7d8
fix: cancelled status was set correctly
viralkansodiya Jul 3, 2025
25b7c9a
Merge pull request #103 from FOSS-ERP/biograph-dev
tactentech Jul 3, 2025
c098450
Merge pull request #104 from bibinprofessional/clinical-note
tactentech Jul 4, 2025
e2f3b3e
feat: Refer Patient functionality
bibinprofessional Jul 4, 2025
2a5c74e
Merge pull request #105 from bibinprofessional/refer-patient
tactentech Jul 4, 2025
a11e19f
feat: Recuring appointments
viralkansodiya Jul 4, 2025
9cf11f3
feat: recuring appoitment feature
viralkansodiya Jul 4, 2025
5d9cff2
fix: cancelled status was set correctly
viralkansodiya Jul 3, 2025
794513c
Merge pull request #107 from FOSS-ERP/biograph-staging
tactentech Jul 4, 2025
4b3f7f9
Merge pull request #106 from FOSS-ERP/recuring_appointments
tactentech Jul 4, 2025
178858b
fix: fixed the scheduder function of status updation
viralkansodiya Jul 8, 2025
e4a518d
Merge pull request #108 from FOSS-ERP/biograph-dev
tactentech Jul 8, 2025
599604f
fix: recuring appointments enhancement
viralkansodiya Jul 10, 2025
f1c18ed
added a scrolling option on dialog box
viralkansodiya Jul 10, 2025
0298ba2
validate the week if not selected
viralkansodiya Jul 10, 2025
16e33a4
Merge pull request #109 from FOSS-ERP/biograph-dev
amalpaul54111 Jul 10, 2025
f77ea47
fix: date and time validation
viralkansodiya Jul 10, 2025
9030b16
Merge pull request #110 from FOSS-ERP/biograph-dev
amalpaul54111 Jul 10, 2025
1653e7e
fix: message of repeat appoitment
viralkansodiya Jul 11, 2025
dd5da51
Merge pull request #111 from FOSS-ERP/biograph-dev
tactentech Jul 11, 2025
198e3bd
fix: position of datepicker
viralkansodiya Jul 12, 2025
0b28224
Merge branch 'Tacten:biograph' into biograph-dev
viralkansodiya Jul 14, 2025
240df39
fix: error of max occurrences calcuation in repeat appointnent
viralkansodiya Jul 14, 2025
e85c4fa
Merge pull request #112 from FOSS-ERP/biograph-dev
tactentech Jul 14, 2025
e6bef99
fix: income account issue for therapy plan sales invoice
viralkansodiya Jul 14, 2025
483db6f
Merge pull request #113 from FOSS-ERP/biograph-dev
tactentech Jul 14, 2025
c8b9953
fix: none value variable
viralkansodiya Jul 14, 2025
ba5d9d8
Revert "fix: none value variable"
viralkansodiya Jul 14, 2025
644c7e1
fix: none value variable
viralkansodiya Jul 14, 2025
779b891
Merge branch 'Tacten:biograph' into biograph-dev
viralkansodiya Jul 14, 2025
bdc6ff5
Merge pull request #114 from FOSS-ERP/biograph-dev
tactentech Jul 15, 2025
a1bdc92
fix: income account issue for therapy plan sales invoice
viralkansodiya Jul 14, 2025
a384a41
feat: Enhanced healthcare practitioner search by department
bibinprofessional Jul 15, 2025
8559dcd
Merge pull request #115 from bibinprofessional/practitioner-enhancement
tactentech Jul 15, 2025
dca0113
feat: Enhanced healthcare practitioner search by department
bibinprofessional Jul 15, 2025
84e7e92
fix: Fixed auto-removal bug of Healthcare Practitioner when fetching …
bibinprofessional Jul 18, 2025
d4cc991
fix: Fixed auto-removal bug of Healthcare Practitioner when fetching …
bibinprofessional Jul 18, 2025
743f82b
Merge pull request #116 from bibinprofessional/local-dev
amalpaul54111 Jul 21, 2025
5bf550d
Merge pull request #117 from bibinprofessional/practitioner-enchancem…
amalpaul54111 Jul 22, 2025
2579a21
fix: added days in block of availabolity HTML
viralkansodiya Jul 22, 2025
f53e859
fix: added a field and total no of session calculation
viralkansodiya Jul 22, 2025
947606b
fix: added a field and total no of session calculation
viralkansodiya Jul 22, 2025
8bcf148
fix: therapy plan has details table so added a calculation of total n…
viralkansodiya Jul 22, 2025
e1c5b6b
Merge pull request #118 from FOSS-ERP/biograph-start
amalpaul54111 Jul 22, 2025
9495fce
Merge branch 'Tacten:biograph-staging' into biograph-staging
viralkansodiya Jul 22, 2025
8019755
Merge pull request #119 from FOSS-ERP/biograph-staging
amalpaul54111 Jul 22, 2025
1040581
Merge pull request #120 from bibinprofessional/local-stage
amalpaul54111 Jul 22, 2025
6144d61
Merge branch 'Tacten:biograph' into biograph-dev
viralkansodiya Jul 22, 2025
44f6c0f
fix: field property changes
viralkansodiya Jul 22, 2025
0045695
fix: remove junk test code
viralkansodiya Jul 22, 2025
38b4370
Merge branch 'biograph' into therapy-dev
viralkansodiya Jul 22, 2025
c6d3d2d
Merge pull request #122 from FOSS-ERP/therapy-dev
amalpaul54111 Jul 22, 2025
8750b7e
Merge branch 'biograph-dev' of https://github.com/FOSS-ERP/biograph-d…
viralkansodiya Jul 23, 2025
f446302
fix: not allow nagetive value
viralkansodiya Jul 23, 2025
fad52b8
set practitioner name in a list view
viralkansodiya Jul 23, 2025
7b1d82e
Merge pull request #123 from FOSS-ERP/biograph-dev
amalpaul54111 Jul 23, 2025
7b983e5
fix: rescdulling conflict bug
viralkansodiya Jul 24, 2025
67240e7
Merge pull request #124 from FOSS-ERP/biograph-dev
amalpaul54111 Jul 25, 2025
8472769
fix: rescheduling conflict bug
viralkansodiya Jul 24, 2025
f4359e7
remove from read only
viralkansodiya Jul 25, 2025
df8bee5
Merge pull request #125 from FOSS-ERP/biograph-staging
amalpaul54111 Jul 25, 2025
2826507
Merge pull request #126 from FOSS-ERP/biograph-dev
amalpaul54111 Jul 25, 2025
ebf0e94
fix: reschedule with block bookingg bug
viralkansodiya Jul 25, 2025
01b5e7a
fix: reschedule with block bookingg bug
viralkansodiya Jul 25, 2025
123e078
fix: reschedule with block bookingg bug
viralkansodiya Jul 25, 2025
4d97685
fix: reschedule with block bookingg bug
viralkansodiya Jul 25, 2025
3cd3a1f
Merge pull request #127 from FOSS-ERP/biograph-dev
amalpaul54111 Jul 25, 2025
82f48c0
Merge pull request #128 from FOSS-ERP/biograph-staging
amalpaul54111 Jul 25, 2025
71632ce
fix: added a field and total no of session calculation
viralkansodiya Jul 22, 2025
cca3f0c
resolve merge conflict
viralkansodiya Jul 22, 2025
4208048
fix: not allow nagetive value
viralkansodiya Jul 23, 2025
2b6c792
remove from read only
viralkansodiya Jul 28, 2025
ac2b907
fix: Label of the field
viralkansodiya Jul 28, 2025
9cbaa34
fix: Label of the field
viralkansodiya Jul 28, 2025
8011a78
Merge pull request #130 from FOSS-ERP/bio-staging
amalpaul54111 Jul 28, 2025
d657426
Merge pull request #129 from FOSS-ERP/biograph-dev
amalpaul54111 Jul 28, 2025
d769ff6
fix:reset the dashboard before load
viralkansodiya Jul 29, 2025
7ca4ed2
fix: doctor advice template department wise
viralkansodiya Jul 29, 2025
61a2836
fix: income account issue for therapy plan sales invoice
viralkansodiya Jul 14, 2025
957a0ef
Merge pull request #131 from FOSS-ERP/biograph-dev
amalpaul54111 Jul 29, 2025
a08dd9a
fix: conflict pop up was not appear
viralkansodiya Jul 29, 2025
920a274
fix: conflict pop up was not appear
viralkansodiya Jul 29, 2025
d2f61f6
fix: doctor advice template as per department
viralkansodiya Jul 29, 2025
6f75df4
Merge pull request #132 from FOSS-ERP/biograph-dev
amalpaul54111 Jul 29, 2025
073f8fc
Merge pull request #133 from FOSS-ERP/bio-staging
amalpaul54111 Jul 29, 2025
c553008
fix: reschedule conflict issue
viralkansodiya Jul 29, 2025
e9e2eaf
Merge pull request #134 from FOSS-ERP/conflict-dev
amalpaul54111 Jul 29, 2025
050b40a
fix: reschedule conflict issue
viralkansodiya Jul 29, 2025
518d6b2
Merge pull request #136 from FOSS-ERP/release/v1.2.2
tactentech Jul 29, 2025
65a1bc4
Merge pull request #135 from FOSS-ERP/bio-staging
amalpaul54111 Jul 30, 2025
f83b7cd
set the default list view for therapy plan table
viralkansodiya Jul 30, 2025
7c651fe
fix: reschedule conflict issue
viralkansodiya Jul 29, 2025
04245ff
set the default list view for therapy plan table
viralkansodiya Jul 30, 2025
d1be6fc
Merge branch 'Tacten:biograph' into biograph-dev
viralkansodiya Jul 30, 2025
21a95f3
Merge pull request #137 from FOSS-ERP/PAS-324
amalpaul54111 Jul 30, 2025
2fbf9e4
Merge pull request #138 from FOSS-ERP/biograph-dev
amalpaul54111 Jul 30, 2025
4f2d886
Chore: Made Clinical note doctype as submittable
bibinprofessional Aug 4, 2025
851a32f
fix: from main encounter to therapy plan field mapping issue
viralkansodiya Aug 4, 2025
84ab5c4
Chore: Made Clinical note doctype as submittable
bibinprofessional Aug 4, 2025
ef03645
Fix: Error on Therapy Plan Details in Patient Encounter: "total_sessi…
bibinprofessional Aug 4, 2025
5ecc93e
Fix: Error on Therapy Plan Details in Patient Encounter: "total_sessi…
bibinprofessional Aug 4, 2025
9675287
Merge pull request #139 from FOSS-ERP/biograph-dev
amalpaul54111 Aug 4, 2025
bb4af47
Merge pull request #140 from bibinprofessional/PAS-399-dev
amalpaul54111 Aug 4, 2025
500ade4
Merge pull request #141 from bibinprofessional/PAS-425-dev
amalpaul54111 Aug 4, 2025
4eb3938
Merge pull request #142 from bibinprofessional/PAS-425-stg
amalpaul54111 Aug 4, 2025
5d986ad
remove a extra html div property
viralkansodiya Aug 6, 2025
6990e58
fix: recurring appointment on therapy plan
viralkansodiya Aug 6, 2025
714659b
Merge pull request #143 from FOSS-ERP/biograph-dev
amalpaul54111 Aug 6, 2025
bcbce00
feat: Added stock consumption details in therapy type and therapy ses…
bibinprofessional Jul 17, 2025
f483557
chore: Added Clinical Procedure Item doctype validations
bibinprofessional Jul 17, 2025
3157f61
chore: Update therapy session with Consumables logic
bibinprofessional Aug 8, 2025
1112ecd
email notification for recurring appointment
viralkansodiya Aug 8, 2025
b1787f5
fix: syntex error
viralkansodiya Aug 8, 2025
79377b9
Merge pull request #145 from FOSS-ERP/biograph-dev
amalpaul54111 Aug 8, 2025
16881b7
Merge pull request #144 from bibinprofessional/PAS-386-dev
amalpaul54111 Aug 8, 2025
f49e7d9
fix: error of whatspp notification
viralkansodiya Aug 8, 2025
392e4a0
Merge pull request #146 from FOSS-ERP/biograph-dev
amalpaul54111 Aug 8, 2025
3810d26
chore: Therapy session Consumables with status headline
bibinprofessional Aug 10, 2025
daff13d
fix: validate the number try to book recurring
viralkansodiya Aug 11, 2025
8ac8dc2
Merge pull request #147 from FOSS-ERP/biograph-dev
amalpaulhm Aug 11, 2025
aeff561
Mandatory field Title
viralkansodiya Aug 11, 2025
fc23aa3
Merge pull request #148 from FOSS-ERP/biograph-dev
amalpaulhm Aug 11, 2025
9dcc89e
Merge pull request #149 from bibinprofessional/PAS-386-dev
amalpaulhm Aug 12, 2025
9d5e66b
fix: medical department wise strict list view
viralkansodiya Aug 12, 2025
ae15d35
Merge pull request #150 from FOSS-ERP/biograph-dev
amalpaul54111 Aug 12, 2025
98c64b9
fix: patient encounter doctor advice template details
viralkansodiya Aug 12, 2025
34a8a26
Merge branch 'Tacten:biograph' into biograph-dev
viralkansodiya Aug 12, 2025
8935c07
fix: from main encounter to therapy plan field mapping issue
viralkansodiya Aug 4, 2025
64f4980
feat: Recuring appointments
viralkansodiya Jul 4, 2025
4e665b8
feat: recuring appoitment feature
viralkansodiya Jul 4, 2025
27adc40
fix: recuring appointments enhancement
viralkansodiya Jul 10, 2025
d6ca0de
validate the week if not selected
viralkansodiya Jul 10, 2025
0306483
fix: error of max occurrences calcuation in repeat appointnent
viralkansodiya Jul 14, 2025
fc5eb82
fix: none value variable
viralkansodiya Jul 14, 2025
9ad1494
Revert "fix: none value variable"
viralkansodiya Jul 14, 2025
f6357e0
fix: none value variable
viralkansodiya Jul 14, 2025
0c2b97b
fix: added days in block of availabolity HTML
viralkansodiya Jul 22, 2025
7081103
email notification for recurring appointment
viralkansodiya Aug 8, 2025
63c38f9
fix: syntex error
viralkansodiya Aug 8, 2025
597713f
fix: error of whatspp notification
viralkansodiya Aug 8, 2025
a70f213
fix: validate the number try to book recurring
viralkansodiya Aug 11, 2025
e36de91
remove notification of recurring appointment
viralkansodiya Aug 12, 2025
5f8fa24
remove notification of recurring appointment
viralkansodiya Aug 12, 2025
94f2641
added a scrolling option on dialog box
viralkansodiya Jul 10, 2025
cbb8b1c
fix: date and time validation
viralkansodiya Jul 10, 2025
eae9094
fix: message of repeat appoitment
viralkansodiya Jul 11, 2025
f5fd52b
fix: position of datepicker
viralkansodiya Jul 12, 2025
1669b75
remove a extra html div property
viralkansodiya Aug 6, 2025
0081ad9
fix: recurring appointment on therapy plan
viralkansodiya Aug 6, 2025
941253b
Merge pull request #151 from FOSS-ERP/biograph-dev
amalpaulhm Aug 12, 2025
b69f6d8
Merge pull request #152 from FOSS-ERP/biograph-staging
amalpaulhm Aug 12, 2025
a69441a
Merge pull request #153 from FOSS-ERP/recurring-staging
tactentech Aug 13, 2025
88ae3e6
fix: therapy plan has details table so added a calculation of total n…
viralkansodiya Jul 22, 2025
c6ca3c8
fix: therapy plan details total session calculation improvement
viralkansodiya Aug 13, 2025
ddf5364
fix: therapy plan details total session calculation improvement
viralkansodiya Aug 13, 2025
3e14c23
Merge pull request #154 from FOSS-ERP/biograph-staging
tactentech Aug 13, 2025
6a8cca5
Merge pull request #155 from bibinprofessional/PAS-399-stg
amalpaulhm Aug 13, 2025
31daeee
Merge pull request #156 from FOSS-ERP/biograph-dev
amalpaulhm Aug 13, 2025
4fe40b9
feat: Doctor Advice Template to predefine a advice
viralkansodiya May 8, 2025
3e76fd9
fix: doctor advice template department wise
viralkansodiya Jul 29, 2025
15798fa
Mandatory field Title
viralkansodiya Aug 11, 2025
e8fb5dc
fix: medical department wise strict list view
viralkansodiya Aug 12, 2025
70fed60
Merge pull request #157 from FOSS-ERP/biograph-stag
amalpaulhm Aug 13, 2025
e746d42
New Patch , Create Apoointment type at the time of setup a site
viralkansodiya Apr 30, 2025
395603c
fix: added a hidden check box in patient appointemt
viralkansodiya Aug 13, 2025
0c91407
Merge pull request #158 from FOSS-ERP/biograph-staging
amalpaulhm Aug 13, 2025
c00f0f7
fixed the filter indexing and tuple indexing
viralkansodiya May 8, 2025
a4e9d83
Merge pull request #159 from FOSS-ERP/biograph-staging
amalpaulhm Aug 14, 2025
187d646
chore: Update therapy consumables table on refresh
bibinprofessional Aug 14, 2025
37009cf
Merge pull request #160 from bibinprofessional/PAS-386-dev
amalpaulhm Aug 18, 2025
0e0f22c
fix: update the non assignment variable
viralkansodiya Aug 19, 2025
5a06a63
Merge branch 'biograph-dev' into biograph-staging
viralkansodiya Aug 19, 2025
2eccd5d
Merge pull request #2 from FOSS-ERP/biograph-staging
viralkansodiya Aug 19, 2025
fd0d0e7
Merge branch 'Tacten:biograph' into biograph-dev
viralkansodiya Aug 19, 2025
cc2b306
Merge pull request #161 from FOSS-ERP/biograph-dev
amalpaulhm Aug 19, 2025
12ab201
fix: update the non assignment variable
viralkansodiya Aug 19, 2025
bbd62f5
fix: indentation issue
viralkansodiya Aug 20, 2025
1ae59b8
Merge pull request #4 from FOSS-ERP/biograph-staging
viralkansodiya Aug 20, 2025
0b48917
Merge pull request #163 from FOSS-ERP/biograph-dev
amalpaulhm Aug 20, 2025
7e96371
Merge pull request #162 from FOSS-ERP/biograph-staging
amalpaulhm Aug 20, 2025
e458294
fix: visibility of the button
viralkansodiya Aug 20, 2025
69e9b74
Merge branch 'Tacten:biograph-staging' into biograph-staging
Viral-Frappe-Dev Aug 20, 2025
9effa3e
Merge pull request #5 from FOSS-ERP/biograph-staging
viralkansodiya Aug 20, 2025
21d8de0
Merge pull request #164 from FOSS-ERP/biograph-staging
amalpaulhm Aug 20, 2025
18cd52b
Merge pull request #165 from FOSS-ERP/biograph-dev
amalpaulhm Aug 20, 2025
0879f02
remove a searchable points from query
viralkansodiya Aug 20, 2025
40ec1b4
Merge branch 'Tacten:biograph-staging' into biograph-staging
viralkansodiya Aug 20, 2025
35ec621
Merge pull request #6 from FOSS-ERP/biograph-staging
viralkansodiya Aug 20, 2025
f8a7dd5
Merge branch 'Tacten:biograph' into biograph-dev
viralkansodiya Aug 20, 2025
ccc1682
Merge pull request #167 from FOSS-ERP/biograph-dev
amalpaulhm Aug 20, 2025
b3a7e90
Merge pull request #166 from FOSS-ERP/biograph-staging
amalpaulhm Aug 20, 2025
717218d
Medical department added in searchable field
viralkansodiya Aug 20, 2025
53e86e5
Merge branch 'biograph-staging' of https://github.com/FOSS-ERP/biogra…
viralkansodiya Aug 20, 2025
878f66f
Merge pull request #7 from FOSS-ERP/biograph-staging
viralkansodiya Aug 20, 2025
527c5cb
Merge branch 'Tacten:biograph' into biograph-dev
viralkansodiya Aug 20, 2025
d3794ca
fix: update the Doctor advice template query
viralkansodiya Aug 20, 2025
13ea27c
Merge pull request #8 from FOSS-ERP/biograph-staging
viralkansodiya Aug 20, 2025
c8e1e52
Merge pull request #169 from FOSS-ERP/biograph-dev
amalpaulhm Aug 20, 2025
3f3b0b8
Merge pull request #168 from FOSS-ERP/biograph-staging
amalpaulhm Aug 20, 2025
329db34
fix: not allow to select any past date before today
viralkansodiya Aug 21, 2025
12c2750
Merge pull request #9 from FOSS-ERP/biograph-staging
viralkansodiya Aug 21, 2025
509d870
Merge pull request #170 from FOSS-ERP/biograph-staging
amalpaulhm Aug 21, 2025
22e24d2
Merge pull request #171 from FOSS-ERP/biograph-dev
amalpaulhm Aug 21, 2025
111cccc
fix: sales invoice price list rate
viralkansodiya Aug 21, 2025
4c1b425
Merge pull request #10 from FOSS-ERP/biograph-staging
viralkansodiya Aug 21, 2025
396f361
Merge pull request #173 from FOSS-ERP/biograph-dev
amalpaul54111 Aug 22, 2025
d424119
Merge branch 'Tacten:biograph-staging' into biograph-staging
viralkansodiya Aug 26, 2025
551c3c2
fix: standard function of get Items from
viralkansodiya Aug 28, 2025
0558cb6
Merge pull request #11 from FOSS-ERP/biograph-staging
viralkansodiya Aug 28, 2025
fc1e790
Merge pull request #174 from FOSS-ERP/biograph-dev
Viral-Frappe-Dev Aug 28, 2025
35dfb44
fix: pricelist rate issue resove
viralkansodiya Aug 28, 2025
3e02eb0
Merge pull request #172 from FOSS-ERP/biograph-staging
Viral-Frappe-Dev Aug 28, 2025
1d36ec5
Merge pull request #12 from FOSS-ERP/biograph-staging
viralkansodiya Sep 4, 2025
659a499
Merge pull request #177 from Tacten/biograph-prod
bibin-hm Sep 12, 2025
29bf865
fix: optimize invoicing queries in TherapyPlan for accurate calculations
bibinprofessional Sep 15, 2025
f329a9f
Merge pull request #178 from bibinprofessional/sales_invoice_therapy_…
bibin-hm Sep 15, 2025
7ba3b61
Merge pull request #179 from Tacten/biograph-staging
Viral-Frappe-Dev Sep 15, 2025
434d66b
fix: mode of payment amount was not able to fetch in table
Sep 18, 2025
af775b0
Merge pull request #180 from Tacten/PAS-509
Viral-Frappe-Dev Sep 18, 2025
3f051f9
change the mop calculation function
Sep 18, 2025
699dd6e
Merge pull request #183 from Tacten/PAS-509
Viral-Frappe-Dev Sep 18, 2025
d9fbb46
fix: dash board visibility for patient
Sep 27, 2025
5924c54
Merge branch 'biograph' of https://github.com/Tacten/biograph into bi…
Sep 27, 2025
399617f
Merge pull request #186 from Tacten/dash-fixes
Viral-Frappe-Dev Sep 27, 2025
c037ad2
Merge pull request #175 from FOSS-ERP/biograph-dev
Viral-Frappe-Dev Sep 29, 2025
86fc30b
fix: update service column name in healthcare services invoice retrieval
bibinprofessional Sep 29, 2025
dfde784
Revert "fix: update service column name in healthcare services invoic…
bibinprofessional Sep 29, 2025
9b03f03
therapy plan fixes related invoices total calculation
Sep 29, 2025
9b1bf2c
invoice total and count of invoiced sessions based on therapy session
Sep 30, 2025
cd68f5e
removed a debugger
Sep 30, 2025
adbec04
Merge pull request #187 from Tacten/dash-fixes
Viral-Frappe-Dev Sep 30, 2025
d545152
fix: update service column to service_name in healthcare services inv…
bibinprofessional Sep 30, 2025
1fb0118
Merge pull request #188 from bibinprofessional/sales-invoice-dev
bibin-hm Sep 30, 2025
e996114
fix: optimize service name retrieval in appointment invoicing
bibinprofessional Sep 30, 2025
fe4843f
Merge pull request #190 from bibinprofessional/sales-invoice-dev
bibin-hm Sep 30, 2025
c3434df
fix: add service_name variable in get_appointments_to_invoice function
bibinprofessional Oct 1, 2025
3957f64
Merge pull request #192 from bibinprofessional/sales-invoice-dev
bibin-hm Oct 1, 2025
fa94f4b
fix: patient duplications
Oct 1, 2025
88c6380
Merge pull request #194 from Tacten/dash-fixes
Viral-Frappe-Dev Oct 1, 2025
e0ac4bd
fix: validate medition qty based on healthcate setting
Viral-Frappe-Dev Oct 8, 2025
5071021
Merge pull request #196 from Tacten/branch0907
Viral-Frappe-Dev Oct 8, 2025
929979b
fix: therapy plan invoice amount calculation for partly paid
viralkansodiya Oct 13, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
# These owners will be the default owners for everything in
# the repo. Unless a later match takes precedence.

* @akurungadam @akashkrishna619
* @akurungadam @Sajinsr
28 changes: 15 additions & 13 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
---
name: Bug Report
description: Report a bug encountered while using Frappe Health
description: Report a bug encountered while using Marley Health
labels: ["bug"]

body:
- type: markdown
attributes:
value: |
Welcome to Frappe Health issue tracker! Before creating an issue, please consider the following:
Welcome to Marley Health issue tracker! Before creating an issue, please consider the following:

1. This tracker should only be used to report bugs and request features / enhancements to Frappe Health
- For questions and general support, checkout the [documentation](https://frappehealth.com/docs) or use the [forum](https://discuss.frappe.io/c/healthcare/58) to get inputs from the open source community.
- For documentation issues, propose edit on the [documentation site](https://frappehealth.com/docs) directly.
2. When making a bug report, make sure you provide all required information. The easier it is for
maintainers to reproduce, the faster it'll be fixed.
1. This tracker should only be used to report bugs and request features / enhancements to Marley Health
- For questions and general support, checkout the [documentation](https://marley.frappe.cloud/docs) or use the [forum](https://discuss.frappe.io/c/healthcare/58) to search for solutions / get inputs from the open source community.
- For documentation issues, propose edit on the [documentation site](https://marley.frappe.cloud/docs) directly.
- You can also post in the Telegram group for Marley Health development work: https://t.me/frappehealth
2. When making a bug report, make sure you provide all required information. The easier it is for maintainers to reproduce, the faster it'll be fixed.
3. If you think you know what the reason for the bug is, share it with us. Maybe put in a PR 😉

- type: textarea
Expand All @@ -29,30 +29,32 @@ body:
id: module
attributes:
label: Module
description: Select the affected module of Frappe Health.
description: Select the affected module of Marley Health.
multiple: true
options:
- Outpatient Module
- Inpatient ADT
- Laboratory
- Diagnostic Module
- Clinical Procedure
- Rehab & Physiotherapy
- Patient History
- Code Standards
- Setup / Configuration
- Integration with ERPNext modules
- Regional / Other Integrations
- Laboratory (legacy)
validations:
required: true

- type: textarea
id: exact-version
attributes:
label: Version
description: Share exact version number of Frappe, ERPNext and Frappe Health you are using.
description: Share exact version number of Frappe, ERPNext and Marley Health you are using.
placeholder: |
Frappe version -
ERPNext version -
Frappe Health version -
Marley Health version -
validations:
required: true

Expand All @@ -61,10 +63,10 @@ body:
attributes:
label: Installation method
options:
- Frappe Cloud
- docker
- easy-install
- manual install
- FrappeCloud
validations:
required: false

Expand All @@ -80,7 +82,7 @@ body:
attributes:
label: Code of Conduct
description: |
By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/frappe/health/blob/develop/CODE_OF_CONDUCT.md)
By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/earthians/marley/blob/develop/CODE_OF_CONDUCT.md)
options:
- label: I agree to follow this project's Code of Conduct
required: true
Expand Down
14 changes: 7 additions & 7 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
---
name: Feature Request
description: Suggest an idea to improve Frappe Health
description: Suggest an idea to improve Marley Health
labels: ["feature-request"]

body:
- type: markdown
attributes:
value: |
Welcome to Frappe Health issue tracker! Before submitting a request, please consider the following:
Welcome to Marley Health issue tracker! Before submitting a request, please consider the following:

1. This tracker should only be used to report bugs and request features / enhancements to Frappe Health
- For questions and general support, checkout the [documentation](https://frappehealth.com/docs) or use the [forum](https://discuss.frappe.io/c/healthcare/58) to get inputs from the open source community.
1. This tracker should only be used to report bugs and request features / enhancements to Marley Health
- For questions and general support, checkout the [documentation](https://marley.frappe.cloud/docs) or use the [forum](https://discuss.frappe.io/c/healthcare/58) to get inputs from the open source community.
2. Use the search function before creating a new issue. Duplicates will be closed and directed to
the original discussion.
3. When making a feature request, make sure to be as verbose as possible. The better you convey your message, the greater the drive to make it happen.
Expand All @@ -20,9 +20,9 @@ body:

If you're in urgent need to a feature, please try the following channels to get paid developments done quickly:
1. Certified Frappe partners: https://frappe.io/partners
2. Healthcare Category on Frappe forum: https://discuss.frappe.io/c/healthcare/58
2. Developer community on Frappe forum: https://discuss.frappe.io/c/developers/5
3. Telegram group for Frappe Health development work: https://t.me/frappehealth
2. Telegram group for Marley Health development work: https://t.me/frappehealth
3. Healthcare Category on Frappe forum: https://discuss.frappe.io/c/healthcare/58
4. Developer community on Frappe forum: https://discuss.frappe.io/c/developers/5

- type: textarea
id: problem-info
Expand Down
4 changes: 2 additions & 2 deletions .github/helper/documentation.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ def docs_link_exists(body):
for word in line.split():
if word.startswith("http") and uri_validator(word):
parsed_url = urlparse(word)
if parsed_url.netloc == "frappehealth.com" and parsed_url.path.startswith("/docs"):
if parsed_url.netloc == "marley.frappe.cloud" and parsed_url.path.startswith("/wiki"):
return True

if __name__ == "__main__":
pr = sys.argv[1]
response = requests.get("https://api.github.com/repos/frappe/health/pulls/{}".format(pr))
response = requests.get("https://api.github.com/repos/earthians/marley/pulls/{}".format(pr))

if response.ok:
payload = response.json()
Expand Down
2 changes: 1 addition & 1 deletion .github/helper/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cd ~ || exit

sudo apt update
sudo apt remove mysql-server mysql-client
sudo apt install libcups2-dev redis-server mariadb-client-10.6
sudo apt install libcups2-dev redis-server mariadb-client

pip install frappe-bench

Expand Down
32 changes: 32 additions & 0 deletions .github/try-on-f-cloud-button.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
check-latest: true

- name: Add to Hosts
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/initiate_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ jobs:
strategy:
fail-fast: false
matrix:
version: ["14"]
version: ["14", "15"]

steps:
- uses: octokit/request-action@v2.x
with:
route: POST /repos/{owner}/{repo}/pulls
owner: frappe
repo: health
owner: earthians
repo: marley
title: |-
"chore: release v${{ matrix.version }}"
body: "Automated beta release."
body: "Automated release."
base: version-${{ matrix.version }}
head: version-${{ matrix.version }}-hotfix
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
run: git clone --depth 1 https://github.com/frappe/semgrep-rules.git frappe-semgrep-rules

- name: Download semgrep
run: pip install semgrep==0.97.0
run: pip install semgrep

- name: Run Semgrep rules
run: semgrep ci --config ./frappe-semgrep-rules/rules --config r/python.lang.correctness
17 changes: 9 additions & 8 deletions .github/workflows/on_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- version-14
- version-15
jobs:
release:
name: Release
Expand All @@ -17,16 +18,16 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
- name: Setup dependencies
run: |
npm install @semantic-release/git @semantic-release/exec --no-save
- name: Create Release
env:
GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
GIT_AUTHOR_NAME: "Frappe PR Bot"
GIT_AUTHOR_EMAIL: "developers@frappe.io"
GIT_COMMITTER_NAME: "Frappe PR Bot"
GIT_COMMITTER_EMAIL: "developers@frappe.io"
run: npx semantic-release
GH_TOKEN: ${{ secrets.EARTHIANS_BOT_TOKEN }}
GITHUB_TOKEN: ${{ secrets.EARTHIANS_BOT_TOKEN }}
GIT_AUTHOR_NAME: "earthians PR Bot"
GIT_AUTHOR_EMAIL: "devs@earthianslive.com"
GIT_COMMITTER_NAME: "earthians PR Bot"
GIT_COMMITTER_EMAIL: "devs@earthianslive.com"
run: npx semantic-release
6 changes: 3 additions & 3 deletions .github/workflows/release_notes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ jobs:
steps:
- name: Update notes
run: |
NEW_NOTES=$(gh api --method POST -H "Accept: application/vnd.github+json" /repos/frappe/health/releases/generate-notes -f tag_name=$RELEASE_TAG | jq -r '.body' | sed -E '/^\* (chore|ci|test|docs|style)/d' )
RELEASE_ID=$(gh api -H "Accept: application/vnd.github+json" /repos/frappe/health/releases/tags/$RELEASE_TAG | jq -r '.id')
gh api --method PATCH -H "Accept: application/vnd.github+json" /repos/frappe/health/releases/$RELEASE_ID -f body="$NEW_NOTES"
NEW_NOTES=$(gh api --method POST -H "Accept: application/vnd.github+json" /repos/earthians/marley/releases/generate-notes -f tag_name=$RELEASE_TAG | jq -r '.body' | sed -E '/^\* (chore|ci|test|docs|style)/d' )
RELEASE_ID=$(gh api -H "Accept: application/vnd.github+json" /repos/earthians/marley/releases/tags/$RELEASE_TAG | jq -r '.id')
gh api --method PATCH -H "Accept: application/vnd.github+json" /repos/earthians/marley/releases/$RELEASE_ID -f body="$NEW_NOTES"

env:
GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
Expand Down
5 changes: 3 additions & 2 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ pull_request_rules:
- name: Auto-close PRs on stable branch
conditions:
- and:
- author!=akashkrishna619
- author!=Sajinsr
- author!=akurungadam
- author!=frappe-pr-bot
- author!=earthians-pr-bot
- author!=mergify[bot]
- author!=github-actions[bot]
- or:
- base=version-16
- base=version-15
Expand Down
6 changes: 3 additions & 3 deletions .releaserc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"branches": ["version-14"],
"branches": ["version-14", "version-15"],
"plugins": [
"@semantic-release/commit-analyzer", {
"preset": "angular",
Expand All @@ -10,7 +10,7 @@
"@semantic-release/release-notes-generator",
[
"@semantic-release/exec", {
"prepareCmd": 'sed -ir "s/[0-9]*\.[0-9]*\.[0-9]*/${nextRelease.version}/" healthcare/__init__.py'
"prepareCmd": 'sed -ir -E "s/\"[0-9]+\.[0-9]+\.[0-9]+\"/\"${nextRelease.version}\"/" healthcare/__init__.py'
}
],
[
Expand All @@ -21,4 +21,4 @@
],
"@semantic-release/github"
]
}
}
Loading