Skip to content

chore: release v15 #1047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
earthians-pr-bot wants to merge 8 commits into
base: version-15
Choose a base branch
from
Open

chore: release v15 #1047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7f89108
fix: accept data kwarg in dashboard get_data() for Frappe v15 compati…
rtmalikian Jun 18, 2026
83ef1c0
fix: department/service unit filter
akurungadam Jun 24, 2026
724eb8c
fix: filters for appointment type queries, merge conflicts
akurungadam Jun 24, 2026
8457abe
fix: string quotes in appointment_type.js
akurungadam Jun 24, 2026
822a758
fix: payments app version
akurungadam Jun 25, 2026
b385b38
fix: branch variable usage in install script
akurungadam Jun 25, 2026
6fc9ce8
fix(reference-range): show reference range "To" field for observation…
md-umair-21 Jun 24, 2026
069eea0
fix(Sample Collection): fetch reference_doc when linking sales invoic…
syedirfan33 Jun 26, 2026
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/helper/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ sed -i 's/schedule:/# schedule:/g' Procfile
sed -i 's/socketio:/# socketio:/g' Procfile
sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile

bench get-app payments
bench get-app payments --branch "$BRANCH_TO_CLONE"
bench get-app https://github.com/frappe/erpnext --branch "$BRANCH_TO_CLONE"
bench get-app healthcare "${GITHUB_WORKSPACE}"

Expand Down
16 changes: 7 additions & 9 deletions healthcare/healthcare/doctype/appointment_type/appointment_type.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ frappe.ui.form.on('Appointment Type', {
return {
filters: {'name': ['=', 'Medical Department']}
};
} else if (frm.doc.allow_booking_for === "Service Unit") {
} else if (frm.doc.allow_booking_for === 'Service Unit') {
return {
filters: {'name': ['=', 'Healthcare Service Unit']}
};
Expand All @@ -25,21 +25,19 @@ frappe.ui.form.on('Appointment Type', {
let child = locals[cdt][cdn];
if (child.dt === 'Medical Department') {
let item_list = doc.items
.filter(item => item.dt === 'Medical Department')
.map(({dn}) => dn);
.filter(item => item.dt === 'Medical Department' && item.dn)
.map(({ dn }) => dn);
return {
filters: [
['Medical Department', 'name', 'not in', item_list]
]
filters: [['Medical Department', 'name', 'not in', item_list]],
};
} else if (child.dt === 'Healthcare Service Unit') {
let item_list = doc.items
.filter(item => item.dt === 'Healthcare Service Unit')
.map(({dn}) => dn);
.filter(item => item.dt === 'Healthcare Service Unit' && item.dn)
.map(({ dn }) => dn);
return {
filters: [
['Healthcare Service Unit', 'name', 'not in', item_list],
['Healthcare Service Unit', 'allow_appointments', "=", 1],
['Healthcare Service Unit', 'allow_appointments', '=', 1],
]
};
}
Expand Down
2 changes: 1 addition & 1 deletion healthcare/healthcare/doctype/healthcare.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
def get_data():
def get_data(data=None):
return []
2 changes: 1 addition & 1 deletion healthcare/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from frappe import _


def get_data():
def get_data(data=None):
return {
"heatmap": True,
"heatmap_message": _("This is based on transactions against this Healthcare Practitioner."),
Expand Down
1 change: 0 additions & 1 deletion healthcare/healthcare/doctype/observation_reference_range/observation_reference_range.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
"label": "Reference Text"
},
{
"depends_on": "eval:doc.permitted_data_type!=\"Quantity\";",
"fieldname": "column_break_l8sr",
"fieldtype": "Column Break"
},
Expand Down
2 changes: 1 addition & 1 deletion healthcare/healthcare/doctype/patient/patient_dashboard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from frappe import _


def get_data():
def get_data(data=None):
return {
"heatmap": True,
"heatmap_message": _(
Expand Down
2 changes: 1 addition & 1 deletion healthcare/healthcare/doctype/sample_collection/sample_collection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def insert_observation(selected, sample_collection, component_observations=None,
sample_col_doc = frappe.db.get_value(
"Sample Collection",
sample_collection,
["reference_name", "patient", "referring_practitioner"],
["reference_name", "reference_doc", "patient", "referring_practitioner"],
as_dict=1,
)
selected = json.loads(selected)
Expand Down
Loading