Merge branch 'develop' into patch-1

.github/helper/install.sh

@@ -40,14 +40,17 @@ 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 --resolve-deps
-bench get-app https://github.com/frappe/erpnext --branch "$BRANCH_TO_CLONE" --resolve-deps
+bench get-app payments
+bench get-app https://github.com/frappe/erpnext --branch "$BRANCH_TO_CLONE"
+bench get-app healthcare "${GITHUB_WORKSPACE}"
+
 bench setup requirements --dev
+CI=Yes bench build --app frappe &
 
 bench start &> bench_run_logs.txt &
-CI=Yes bench build --app frappe &
+
 bench --site test_site reinstall --yes
 
-bench get-app healthcare "${GITHUB_WORKSPACE}"
 bench --verbose --site test_site install-app healthcare
-bench setup requirements --dev
+
+

.github/workflows/ci.yml

@@ -94,7 +94,6 @@ jobs:
         run: |
           bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
           cd ~/frappe-bench/ && source env/bin/activate
-          cd apps/healthcare && pip install -r dev-requirements.txt
         env:
           BRANCH_TO_CLONE: ${{ env.FH_BRANCH }}
 

healthcare/hooks.py

@@ -1,5 +1,3 @@
-from frappe import _
-
 from . import __version__ as app_version  # noqa
 
 app_name = "healthcare"
@@ -252,25 +250,25 @@
 # nosemgrep
 standard_portal_menu_items = [
 	{
-		"title": _("Personal Details"),
+		"title": "Personal Details",
 		"route": "/personal-details",
 		"reference_doctype": "Patient",
 		"role": "Patient",
 	},
 	{
-		"title": _("Lab Test"),
+		"title": "Lab Test",
 		"route": "/lab-test",
 		"reference_doctype": "Lab Test",
 		"role": "Patient",
 	},
 	{
-		"title": _("Prescription"),
+		"title": "Prescription",
 		"route": "/prescription",
 		"reference_doctype": "Patient Encounter",
 		"role": "Patient",
 	},
 	{
-		"title": _("Patient Appointment"),
+		"title": "Patient Appointment",
 		"route": "/patient-appointments",
 		"reference_doctype": "Patient Appointment",
 		"role": "Patient",