From f5eda62760e0cd92169b2c7e02849a6158ffc66c Mon Sep 17 00:00:00 2001
From: FOFOU FONZAM Gui Arnaud <gui.fofou@uni2growcameroun.com>
Date: Thu, 21 Nov 2024 01:33:18 +0100
Subject: [PATCH 01/12] OP-1363 | Fix NullPointerException on PatientBillEdit
 (#2089)

* fix NullPointerexception

* update src/main/java/org/isf/accounting/gui/PatientBillEdit.java

* remove message bundle added

* remove space added

* fix NullPointerException on edit bill

---------

Co-authored-by: ArnaudFofou <gui.fofou@umi2growcameroun.com>
---
 src/main/java/org/isf/accounting/gui/PatientBillEdit.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/isf/accounting/gui/PatientBillEdit.java b/src/main/java/org/isf/accounting/gui/PatientBillEdit.java
index 4923780d49..23349004c3 100644
--- a/src/main/java/org/isf/accounting/gui/PatientBillEdit.java
+++ b/src/main/java/org/isf/accounting/gui/PatientBillEdit.java
@@ -845,11 +845,13 @@ private JButton getJButtonTrashPatient() {
 			jButtonTrashPatient.setPreferredSize(new Dimension(25, 25));
 			jButtonTrashPatient.setIcon(new ImageIcon("rsc/icons/remove_patient_button.png"));
 			jButtonTrashPatient.setToolTipText(MessageBundle.getMessage("angal.newbill.removethepatientassociatedwiththisbill.tooltip"));
+			if (thisBill.getBillPatient() == null) {
+				jButtonTrashPatient.setEnabled(false);
+			}
 			jButtonTrashPatient.addActionListener(actionEvent -> {
 				// BILL
 				thisBill.setBillPatient(null);
 				thisBill.setIsPatient(false);
-				thisBill.getBillPatient().setCode(0);
 				thisBill.setPatName(""); //$NON-NLS-1$
 				thisBill.setAdmission(null);
 				// INTERFACE
@@ -895,6 +897,9 @@ private void setJButtonPickPatient() {
 			jButtonPickPatient.setText(MessageBundle.getMessage("angal.newbill.changepatient.btn"));
 			jButtonPickPatient.setMnemonic(MessageBundle.getMnemonic("angal.newbill.changepatient.btn.key"));
 			jButtonPickPatient.setToolTipText(MessageBundle.getMessage("angal.newbill.changethepatientassociatedwiththisbill.tooltip"));
+			if (jButtonTrashPatient != null) {
+				jButtonTrashPatient.setEnabled(true);	
+			}
 		}
 	}
 

From 1920be9dfed7abd366f8034584eb8239557eea74 Mon Sep 17 00:00:00 2001
From: FOFOU FONZAM Gui Arnaud <gui.fofou@uni2growcameroun.com>
Date: Thu, 21 Nov 2024 11:28:26 +0100
Subject: [PATCH 02/12] OP-1361 | Fix getMedicalsWard method (#2088)

* update the param of getMedicalsWard

* update src/main/java/org/isf/medicalstockward/gui/WardPharmacyRectify.java

---------

Co-authored-by: ArnaudFofou <gui.fofou@umi2growcameroun.com>
---
 src/main/java/org/isf/medicalstockward/gui/WardPharmacy.java  | 4 ++--
 .../org/isf/medicalstockward/gui/WardPharmacyRectify.java     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/isf/medicalstockward/gui/WardPharmacy.java b/src/main/java/org/isf/medicalstockward/gui/WardPharmacy.java
index 5c50678441..587ad2a2d0 100644
--- a/src/main/java/org/isf/medicalstockward/gui/WardPharmacy.java
+++ b/src/main/java/org/isf/medicalstockward/gui/WardPharmacy.java
@@ -1461,8 +1461,8 @@ class DrugsModel extends DefaultTableModel {
 
 		public DrugsModel() {
 			try {
-				tableModel = movWardBrowserManager.getMedicalsWardTotalQuantity(wardSelected.getCode().charAt(0));
-				wardDrugs = movWardBrowserManager.getMedicalsWard(wardSelected.getCode().charAt(0), true);
+				tableModel = movWardBrowserManager.getMedicalsWardTotalQuantity(wardSelected.getCode());
+				wardDrugs = movWardBrowserManager.getMedicalsWard(wardSelected.getCode(), true);
 			} catch (OHServiceException e) {
 				OHServiceExceptionUtil.showMessages(e);
 				tableModel = new ArrayList<>();
diff --git a/src/main/java/org/isf/medicalstockward/gui/WardPharmacyRectify.java b/src/main/java/org/isf/medicalstockward/gui/WardPharmacyRectify.java
index 194ade63bb..7264a6f36e 100644
--- a/src/main/java/org/isf/medicalstockward/gui/WardPharmacyRectify.java
+++ b/src/main/java/org/isf/medicalstockward/gui/WardPharmacyRectify.java
@@ -162,7 +162,7 @@ public WardPharmacyRectify(JFrame owner, Ward ward) {
 		super(owner, true);
 		selectedWard = ward;
 		try {
-			wardDrugs = movWardBrowserManager.getMedicalsWard(selectedWard.getCode().charAt(0), false);
+			wardDrugs = movWardBrowserManager.getMedicalsWard(selectedWard.getCode(), false);
 		} catch (OHServiceException e) {
 			OHServiceExceptionUtil.showMessages(e);
 		}
@@ -184,7 +184,7 @@ public WardPharmacyRectify(JFrame owner, Ward ward, Medical medical) {
 		super(owner, true);
 		selectedWard = ward;
 		try {
-			wardDrugs = movWardBrowserManager.getMedicalsWard(selectedWard.getCode().charAt(0), false);
+			wardDrugs = movWardBrowserManager.getMedicalsWard(selectedWard.getCode(), false);
 		} catch (OHServiceException e) {
 			OHServiceExceptionUtil.showMessages(e);
 		}

From cb7f20fc1ef3c82e78944fe22a7c24bcc54aa8d4 Mon Sep 17 00:00:00 2001
From: Alessandro Domanico <alessandro.domanico@yahoo.it>
Date: Fri, 22 Nov 2024 12:31:02 +0100
Subject: [PATCH 03/12] Fix for merges (#2090)

---
 .github/workflows/maven.yml | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 1c510b6f32..a59dd84ef4 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -29,20 +29,27 @@ jobs:
         run: |
           # Set default FORK_REPO and BRANCH_NAME values.
           BRANCH_NAME="${GITHUB_HEAD_REF:-${GITHUB_REF##*/}}"
-          FORK_REPO="${GITHUB_HEAD_REPOSITORY:-${GITHUB_ACTOR}/openhospital-core}"
-          CHECK_BRANCH_URL="https://github.com/${GITHUB_ACTOR}/openhospital-core/tree/$BRANCH_NAME"
-          echo "Checking branch existence with: curl -s -o /dev/null -w \"%{http_code}\" $CHECK_BRANCH_URL"
           
-          # Determine FORK_REPO with fallback logic
-          if [[ -n "${GITHUB_HEAD_REPOSITORY}" ]]; then
-            echo "Using ${GITHUB_HEAD_REPOSITORY}."
-            FORK_REPO=${GITHUB_HEAD_REPOSITORY}
-          elif curl -s -o /dev/null -w "%{http_code}" $CHECK_BRANCH_URL | grep -q "200"; then
-            echo "Using ${GITHUB_ACTOR}/openhospital-core"
-            FORK_REPO=${GITHUB_ACTOR}/openhospital-core
-          else
-            echo "Using informatici/openhospital-core."
+          if [[ "$GITHUB_EVENT_NAME" == "push" && "$GITHUB_REPOSITORY" == "informatici/openhospital-api" ]]; then
+            # For pushes to the main repository, default to the main core repo
             FORK_REPO="informatici/openhospital-core"
+          else
+            # For pull requests or other pushes, use the contributor fork if applicable
+            if [[ -n "$GITHUB_HEAD_REPOSITORY" ]]; then
+              FORK_REPO="$GITHUB_HEAD_REPOSITORY"
+            else
+              # Check if the actor's repo exists with the branch
+              FORK_REPO="${GITHUB_ACTOR}/openhospital-core"
+              CHECK_BRANCH_URL="https://github.com/$FORK_REPO/tree/$BRANCH_NAME"
+              echo "Checking branch existence with: curl -s -o /dev/null -w \"%{http_code}\" $CHECK_BRANCH_URL"
+
+              if curl -s -o /dev/null -w "%{http_code}" "$CHECK_BRANCH_URL" | grep -q "200"; then
+                echo "Branch $BRANCH_NAME exists in $FORK_REPO."
+              else
+                # Fallback to the main repository if the branch doesn’t exist in the fork
+                FORK_REPO="informatici/openhospital-core"
+              fi
+            fi
           fi
           
           # Export FORK_REPO and BRANCH_NAME to GITHUB_ENV for the next step

From f23a4fbe56613703d0ca1b22cc8518672fb90e1d Mon Sep 17 00:00:00 2001
From: mwithi <alessandro.domanico@yahoo.it>
Date: Fri, 22 Nov 2024 13:03:37 +0100
Subject: [PATCH 04/12] Fix typo

---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index a59dd84ef4..a403a87f70 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -30,7 +30,7 @@ jobs:
           # Set default FORK_REPO and BRANCH_NAME values.
           BRANCH_NAME="${GITHUB_HEAD_REF:-${GITHUB_REF##*/}}"
           
-          if [[ "$GITHUB_EVENT_NAME" == "push" && "$GITHUB_REPOSITORY" == "informatici/openhospital-api" ]]; then
+          if [[ "$GITHUB_EVENT_NAME" == "push" && "$GITHUB_REPOSITORY" == "informatici/openhospital-gui" ]]; then
             # For pushes to the main repository, default to the main core repo
             FORK_REPO="informatici/openhospital-core"
           else

From fed3d55b31b9332972461dd0d64e88d2b10dd724 Mon Sep 17 00:00:00 2001
From: Steve Tsala <45661418+SteveGT96@users.noreply.github.com>
Date: Tue, 26 Nov 2024 11:10:21 +0100
Subject: [PATCH 05/12] OP-1043 | Remove deleted group from user edit group
 jcombo box (#2096)

* fix(OP-1043): Remove deleted group from user edit group jcombo box

* chore: Reformat code

---------

Co-authored-by: SteveGT96 <steve.tsala@intesys.it>
---
 src/main/java/org/isf/menu/gui/UserEdit.java | 22 ++++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/isf/menu/gui/UserEdit.java b/src/main/java/org/isf/menu/gui/UserEdit.java
index 2c444058bd..55fa9c1833 100644
--- a/src/main/java/org/isf/menu/gui/UserEdit.java
+++ b/src/main/java/org/isf/menu/gui/UserEdit.java
@@ -340,20 +340,24 @@ private JComboBox<UserGroup> getUserGroupComboBox() {
 		if (userGroupComboBox == null) {
 			userGroupComboBox = new JComboBox<>();
 			try {
-				List<UserGroup> group = userBrowsingManager.getUserGroup();
+				List<UserGroup> groups = userBrowsingManager.getUserGroup();
 				if (insert) {
-					if (group != null) {
-						for (UserGroup elem : group) {
-							userGroupComboBox.addItem(elem);
+					if (groups != null) {
+						for (UserGroup group : groups) {
+							if (!group.isDeleted()) {
+								userGroupComboBox.addItem(group);
+							}
 						}
 					}
 				} else {
 					UserGroup selectedUserGroup = null;
-					if (group != null) {
-						for (UserGroup elem : group) {
-							userGroupComboBox.addItem(elem);
-							if (user.getUserGroupName().equals(elem)) {
-								selectedUserGroup = elem;
+					if (groups != null) {
+						for (UserGroup group : groups) {
+							if (!group.isDeleted()) {
+								userGroupComboBox.addItem(group);
+								if (user.getUserGroupName().equals(group)) {
+									selectedUserGroup = group;
+								}
 							}
 						}
 					}

From d2461861d408b77852fcee84d4d8827ba90af036 Mon Sep 17 00:00:00 2001
From: Mohit Sojitra <mohitsojitraa@gmail.com>
Date: Tue, 26 Nov 2024 10:39:06 -0400
Subject: [PATCH 06/12] OP-1341 Enable Medical Type for Soft Deletion (#2092)

* Added option to mark medical type as active and add filter

* Title fixed

* Updated the CORE call to new type

* Fixed text
---
 .../org/isf/medicals/gui/MedicalBrowser.java  |  2 +-
 .../org/isf/medicals/gui/MedicalEdit.java     |  2 +-
 .../isf/medicalstock/gui/MovStockBrowser.java |  2 +-
 .../isf/medtype/gui/MedicalTypeBrowser.java   | 13 +++++++++--
 .../medtype/gui/MedicalTypeBrowserEdit.java   | 22 ++++++++++++++++---
 5 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/isf/medicals/gui/MedicalBrowser.java b/src/main/java/org/isf/medicals/gui/MedicalBrowser.java
index 231810640a..74b3f27d7f 100644
--- a/src/main/java/org/isf/medicals/gui/MedicalBrowser.java
+++ b/src/main/java/org/isf/medicals/gui/MedicalBrowser.java
@@ -595,7 +595,7 @@ private JComboBox getComboBoxMedicalType() {
 			pbox.addItem(STR_ALL);
 			List<MedicalType> type;
 			try {
-				type = medicalTypeManager.getMedicalType();
+				type = medicalTypeManager.getAllActiveMedicalType();
 				for (MedicalType elem : type) {
 					pbox.addItem(elem);
 				}
diff --git a/src/main/java/org/isf/medicals/gui/MedicalEdit.java b/src/main/java/org/isf/medicals/gui/MedicalEdit.java
index 61825d0143..f953292a70 100644
--- a/src/main/java/org/isf/medicals/gui/MedicalEdit.java
+++ b/src/main/java/org/isf/medicals/gui/MedicalEdit.java
@@ -432,7 +432,7 @@ private JComboBox<MedicalType> getTypeComboBox() {
 		if (typeComboBox == null) {
 			typeComboBox = new JComboBox<>();
 			try {
-				List<MedicalType> types = medicalTypeManager.getMedicalType();
+				List<MedicalType> types = medicalTypeManager.getAllActiveMedicalType();
 				for (MedicalType elem : types) {
 					typeComboBox.addItem(elem);
 				}
diff --git a/src/main/java/org/isf/medicalstock/gui/MovStockBrowser.java b/src/main/java/org/isf/medicalstock/gui/MovStockBrowser.java
index 99ab7dc533..02b7a0c10c 100644
--- a/src/main/java/org/isf/medicalstock/gui/MovStockBrowser.java
+++ b/src/main/java/org/isf/medicalstock/gui/MovStockBrowser.java
@@ -618,7 +618,7 @@ private JComboBox getMedicalTypeBox() {
 		medicalTypeBox.addItem(TEXT_ALL);
 
 		try {
-			medical = medicalTypeBrowserManager.getMedicalType();
+			medical = medicalTypeBrowserManager.getAllActiveMedicalType();
 
 			for (MedicalType aMedicalType : medical) {
 				medicalTypeBox.addItem(aMedicalType);
diff --git a/src/main/java/org/isf/medtype/gui/MedicalTypeBrowser.java b/src/main/java/org/isf/medtype/gui/MedicalTypeBrowser.java
index 6c9fdb9d49..7e173e9744 100644
--- a/src/main/java/org/isf/medtype/gui/MedicalTypeBrowser.java
+++ b/src/main/java/org/isf/medtype/gui/MedicalTypeBrowser.java
@@ -54,9 +54,10 @@ public class MedicalTypeBrowser extends ModalJFrame implements MedicalTypeListen
 	private List<MedicalType> pMedicalType;
 	private String[] pColumns = {
 			MessageBundle.getMessage("angal.common.code.txt").toUpperCase(),
-			MessageBundle.getMessage("angal.common.description.txt").toUpperCase()
+			MessageBundle.getMessage("angal.common.description.txt").toUpperCase(),
+			MessageBundle.getMessage("angal.common.deleted.label").toUpperCase()
 	};
-	private int[] pColumnWidth = {80, 200};
+	private final int[] pColumnWidth = { 20, 200, 20 };
 	private JPanel jContainPanel;
 	private JPanel jButtonPanel;
 	private JButton jNewButton;
@@ -198,6 +199,7 @@ private JTable getJTable() {
 			jTable = new JTable(model);
 			jTable.getColumnModel().getColumn(0).setMinWidth(pColumnWidth[0]);
 			jTable.getColumnModel().getColumn(1).setMinWidth(pColumnWidth[1]);
+			jTable.getColumnModel().getColumn(2).setMinWidth(pColumnWidth[2]);
 		}
 		return jTable;
 	}
@@ -243,6 +245,8 @@ public Object getValueAt(int r, int c) {
 				return medType.getCode();
 			} else if (c == 1) {
 				return medType.getDescription();
+			} else if (c == 2) {
+				return medType.getDeleted() == 'Y';
 			}
 			return null;
 		}
@@ -251,6 +255,11 @@ public Object getValueAt(int r, int c) {
 		public boolean isCellEditable(int arg0, int arg1) {
 			return false;
 		}
+		
+		@Override
+		public Class getColumnClass(int column) {
+			return (column == 2) ? Boolean.class : String.class;
+		}
 	}
 
 	@Override
diff --git a/src/main/java/org/isf/medtype/gui/MedicalTypeBrowserEdit.java b/src/main/java/org/isf/medtype/gui/MedicalTypeBrowserEdit.java
index 82e8f69556..36e4613717 100644
--- a/src/main/java/org/isf/medtype/gui/MedicalTypeBrowserEdit.java
+++ b/src/main/java/org/isf/medtype/gui/MedicalTypeBrowserEdit.java
@@ -26,6 +26,7 @@
 import java.util.EventListener;
 
 import javax.swing.JButton;
+import javax.swing.JCheckBox;
 import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
@@ -95,8 +96,10 @@ private void fireMedicalUpdated() {
 	private JButton cancelButton;
 	private JButton okButton;
 	private JTextField descriptionTextField;
+	private JCheckBox deletedCheckbox;
 	private VoLimitedTextField codeTextField;
 	private String lastdescription;
+	private char isLastDeleted;
 	private MedicalType medicalType;
 	private boolean insert;
 	private JPanel jDataPanel;
@@ -110,6 +113,7 @@ public MedicalTypeBrowserEdit(JFrame owner, MedicalType old, boolean inserting)
 		insert = inserting;
 		medicalType = old; //medical type will be used for every operation
 		lastdescription = medicalType.getDescription();
+		isLastDeleted = medicalType.getDeleted();
 		initialize();
 	}
 
@@ -124,6 +128,7 @@ private void initialize() {
 			this.setTitle(MessageBundle.getMessage("angal.medtype.editmedicaltype.title"));
 		}
 		this.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+		this.getDeletedField();
 		this.pack();
 		this.setLocationRelativeTo(null);
 	}
@@ -197,7 +202,8 @@ private JButton getOkButton() {
 
 				medicalType.setDescription(descriptionTextField.getText());
 				medicalType.setCode(codeTextField.getText());
-
+				medicalType.setDeleted(deletedCheckbox.isSelected() ? 'Y' : 'N');
+				
 				if (insert) { // inserting
 					try {
 						MedicalType insertedMedicalType = medicalTypeBrowserManager.newMedicalType(medicalType);
@@ -211,7 +217,7 @@ private JButton getOkButton() {
 						OHServiceExceptionUtil.showMessages(e1);
 					}
 				} else { // updating
-					if (descriptionTextField.getText().equals(lastdescription)) {
+					if (descriptionTextField.getText().equals(lastdescription) && medicalType.getDeleted() == isLastDeleted) {
 						dispose();
 					} else {
 						try {
@@ -263,6 +269,14 @@ private JTextField getCodeTextField() {
 		}
 		return codeTextField;
 	}
+	
+	private JCheckBox getDeletedField() {
+		if (deletedCheckbox == null) {
+			deletedCheckbox = new JCheckBox(MessageBundle.getMessage("angal.common.deleted.label"));
+			deletedCheckbox.setSelected(medicalType.getDeleted() == 'Y');
+		}
+		return deletedCheckbox;
+	}
 
 	/**
 	 * This method initializes jDataPanel	
@@ -276,7 +290,9 @@ private JPanel getJDataPanel() {
 			jDataPanel.add(getCodeTextField());
 			jDataPanel.add(new JLabel(MessageBundle.getMessage("angal.common.description.txt") + ':'));
 			jDataPanel.add(getDescriptionTextField());
-			SpringUtilities.makeCompactGrid(jDataPanel, 2, 2, 5, 5, 5, 5);
+			jDataPanel.add(new JLabel(MessageBundle.getMessage("angal.common.deleted.label") + ':'));
+			jDataPanel.add(getDeletedField());
+			SpringUtilities.makeCompactGrid(jDataPanel, 3, 2, 5, 5, 5, 5);
 		}
 		return jDataPanel;
 	}

From a4f6d7174330d62bb2e7475c025792ca30cb0ab1 Mon Sep 17 00:00:00 2001
From: David B Malkovsky <david@malkovsky.org>
Date: Wed, 27 Nov 2024 02:31:59 -0500
Subject: [PATCH 07/12] Chore: add missing @Override annotation (#2097)

---
 src/main/java/org/isf/telemetry/gui/TelemetryEdit.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/isf/telemetry/gui/TelemetryEdit.java b/src/main/java/org/isf/telemetry/gui/TelemetryEdit.java
index 497418c7cb..6663e6c806 100644
--- a/src/main/java/org/isf/telemetry/gui/TelemetryEdit.java
+++ b/src/main/java/org/isf/telemetry/gui/TelemetryEdit.java
@@ -217,6 +217,7 @@ private ActionListener buildConfirmationActionListener(List<CheckBoxWrapper> che
 					TelemetryManager telemetryManager, TelemetryUtils telemetryUtils) {
 		return new ActionListener() {
 
+			@Override
 			public void actionPerformed(ActionEvent e) {
 
 				if (!agreementCheckbox.isSelected()) {

From 1a41c2c9dbf4d9f65bbc91a9ad28b7c3005829df Mon Sep 17 00:00:00 2001
From: dbm <david@malkovsky.org>
Date: Tue, 3 Dec 2024 13:53:28 -0500
Subject: [PATCH 08/12] Chore: MessageDialog methods take a bundle key not the
 resolved message

---
 .../isf/examination/gui/PatientExaminationEdit.java  |  4 ++--
 src/main/java/org/isf/menu/gui/GroupEdit.java        |  2 +-
 src/main/java/org/isf/opd/gui/OpdBrowser.java        | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/isf/examination/gui/PatientExaminationEdit.java b/src/main/java/org/isf/examination/gui/PatientExaminationEdit.java
index 847b5e35ab..359e7add98 100644
--- a/src/main/java/org/isf/examination/gui/PatientExaminationEdit.java
+++ b/src/main/java/org/isf/examination/gui/PatientExaminationEdit.java
@@ -1468,7 +1468,7 @@ public void actionPerformed(ActionEvent actionEvent) {
 
 			if (weight != 0 && height != 0) {
 				if (weight == ExaminationParameters.WEIGHT_MIN || weight == ExaminationParameters.WEIGHT_MAX || height == ExaminationParameters.HEIGHT_MIN || height == ExaminationParameters.HEIGHT_MAX) {
-					int response = MessageDialog.yesNo(null, MessageBundle.getMessage("angal.patient.examination.minmaxvalues.msg"));
+					int response = MessageDialog.yesNo(null, "angal.patient.examination.minmaxvalues.msg");
 					if (response == JOptionPane.YES_OPTION) {
 						savePatientExamaination();
 					}
@@ -1476,7 +1476,7 @@ public void actionPerformed(ActionEvent actionEvent) {
 					savePatientExamaination();
 				}
 			} else {
-				MessageDialog.error(null, MessageBundle.getMessage("angal.patient.examination.nonzero.msg"));
+				MessageDialog.error(null, "angal.patient.examination.nonzero.msg");
 			}
 		}
 	}
diff --git a/src/main/java/org/isf/menu/gui/GroupEdit.java b/src/main/java/org/isf/menu/gui/GroupEdit.java
index 5e17a2098a..7e59ca01d7 100644
--- a/src/main/java/org/isf/menu/gui/GroupEdit.java
+++ b/src/main/java/org/isf/menu/gui/GroupEdit.java
@@ -187,7 +187,7 @@ private JButton getOkButton() {
 			okButton.setMnemonic(MessageBundle.getMnemonic("angal.common.ok.btn.key"));
 			okButton.addActionListener(actionEvent -> {
 				if (nameTextField.getText().isEmpty()) {
-					MessageDialog.error(null, MessageBundle.getMessage("angal.groupsbrowser.pleaseinsertavalidusergroupname.msg"));
+					MessageDialog.error(null, "angal.groupsbrowser.pleaseinsertavalidusergroupname.msg");
 					return;
 				}
 
diff --git a/src/main/java/org/isf/opd/gui/OpdBrowser.java b/src/main/java/org/isf/opd/gui/OpdBrowser.java
index cba8241a35..aa192c6c59 100644
--- a/src/main/java/org/isf/opd/gui/OpdBrowser.java
+++ b/src/main/java/org/isf/opd/gui/OpdBrowser.java
@@ -1142,7 +1142,7 @@ public void keyPressed(KeyEvent e) {
 				try {
 					code = Integer.parseInt(codeHint);
 				} catch (NumberFormatException e1) {
-					MessageDialog.error(OpdBrowser.this, MessageBundle.getMessage("angal.common.pleaseinsertavalidnumber.msg"));
+					MessageDialog.error(OpdBrowser.this, "angal.common.pleaseinsertavalidnumber.msg");
 					return;
 				}
 				progYearFilter.setText("");
@@ -1155,7 +1155,7 @@ public void keyPressed(KeyEvent e) {
 					((AbstractTableModel) jTable.getModel()).fireTableDataChanged();
 					rowCounter.setText(rowCounterText + pSur.size());
 				} else {
-					MessageDialog.info(OpdBrowser.this, MessageBundle.getMessage("angal.common.nodatatoshow.msg"));
+					MessageDialog.info(OpdBrowser.this, "angal.common.nodatatoshow.msg");
 				}
 			}
 		}
@@ -1176,7 +1176,7 @@ public void keyPressed(KeyEvent e) {
 				try {
 					code = Integer.parseInt(codeHint);
 				} catch (NumberFormatException e1) {
-					MessageDialog.error(OpdBrowser.this, MessageBundle.getMessage("angal.common.pleaseinsertavalidnumber.msg"));
+					MessageDialog.error(OpdBrowser.this, "angal.common.pleaseinsertavalidnumber.msg");
 					return;
 				}
 				opdCodeFilter.setText("");
@@ -1185,7 +1185,7 @@ public void keyPressed(KeyEvent e) {
 				((AbstractTableModel) jTable.getModel()).fireTableDataChanged();
 				rowCounter.setText(rowCounterText + pSur.size());
 				if (pSur.isEmpty()) {
-					MessageDialog.info(OpdBrowser.this, MessageBundle.getMessage("angal.common.nodatatoshow.msg"));
+					MessageDialog.info(OpdBrowser.this, "angal.common.nodatatoshow.msg");
 				}
 			}
 		}
@@ -1206,7 +1206,7 @@ public void keyPressed(KeyEvent e) {
 				try {
 					code = Integer.parseInt(codeHint);
 				} catch (NumberFormatException e1) {
-					MessageDialog.error(OpdBrowser.this, MessageBundle.getMessage("angal.common.pleaseinsertavalidnumber.msg"));
+					MessageDialog.error(OpdBrowser.this, "angal.common.pleaseinsertavalidnumber.msg");
 					return;
 				}
 				opdCodeFilter.setText("");
@@ -1216,7 +1216,7 @@ public void keyPressed(KeyEvent e) {
 					((AbstractTableModel) jTable.getModel()).fireTableDataChanged();
 					rowCounter.setText(rowCounterText + pSur.size());
 					if (pSur.isEmpty()) {
-						MessageDialog.info(OpdBrowser.this, MessageBundle.getMessage("angal.common.nodatatoshow.msg"));
+						MessageDialog.info(OpdBrowser.this, "angal.common.nodatatoshow.msg");
 					}
 				} catch (OHServiceException ohServiceException) {
 					MessageDialog.showExceptions(ohServiceException);

From 655bd0ec1f0d7f6dd3077abc1aebcdc56ca40a0f Mon Sep 17 00:00:00 2001
From: ArnaudFofou <gui.fofou@umi2growcameroun.com>
Date: Wed, 4 Dec 2024 10:08:00 +0100
Subject: [PATCH 09/12] fix error Inpatient Montly Report truncates the year
 value in the header

---
 rpt_extra/hmis108_cover.jasper | Bin 38958 -> 39139 bytes
 rpt_extra/hmis108_cover.jrxml  |  10 +++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rpt_extra/hmis108_cover.jasper b/rpt_extra/hmis108_cover.jasper
index b71ba80bbf61a7115be6375ac357420f931a018f..89bd4373eae69bee84655b9679ca44f962a93e88 100644
GIT binary patch
delta 4738
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
E|6;<<Q2+n{

delta 4667
zcmZu!c~n%_8GmmU9&Ug-;4%mdFf6mk%rFp;YS}bY0VPKfQI-jdFyP3rD58#t;!-sz
z*QjkH)*O#9;(|_FP2$?Ln&^o~O_vi*MXYUNN~q>&qdn2|efPb0=gyS*<1N4Yz3=z?
zefN9!-TC_|*@-?`-=I=9bj&@ZTrT6!sLcP*enZC?hEbugl1XTL=O`F0A2H9LRl84(
z{XrI{XlbdfY-WOT?Y0%RgqG&o`h*1wewLlq+Q2Y;f(NRH=xT8OsG(yG@N+dXDaf3!
zac6|&$syIwNs%lN{bq6-oJ{H>INj1{(Mff_bQ!MZ-1^X?5a|BvlrpR=B_e%tlap~V
z1?~@iKI_WI$1g6)e>eZWe^w>tWsPcdBEkw8GV~Ehp$Qg}8AjrVN^wwuCdUh1fzex<
zxqv=)OhRdqDR9{mDRHfTR(tjN$JwLVjCs9BzL<Sk<eCXl!1G!Z<~bN;j>Ht;8ASGx
z!vW0Sh#x!{g#{jrG9Y<$lth{lJp(S+M@yu;93j_hCOrG$56xlYF5bv2^d)s^IW$`v
z01rXo)@cLba;H}9K}IVjZ!pfGz!*Z87n2HcTVf=--b2sI^QLy6d8=md_}#j^Az!+H
zI4%h6+-<;C?0DQ3YYi9X7>4eX18vt9YZhhLVht!Hj!2jvmkAQ~#YqxQ7T!%enES<K
zec<Pd9^K4z_(}-V2@;;t5}fh0gcl$IA7}~Acu9gY-hg6sL_(zwSK)vz9o^SW1U0Nt
zoYf?JXYlHr6M9@+Rzij9vIf#Qbq1X8utBo)UU7fImj3JM1>e4i{MDnJGv1aosMe?w
zc(lkkm5cRssn|knJZ}ge7}^kP!13sn(ckm94lbd88>eFN?@#?ec#FrO%Y|z6WnvIQ
z3FF1r=Um~)fi~NjKu-3risZD6DOlL$gbc`$q1T|3CO@P%;qC&maue<@r)h%3S8kHJ
zOBm<SpeY;%$Cy{bX_Glqr0TgD&=dZr4Iv9}&v$Fb&v{3zff~IsCrWf(7C%&MA#`09
zO!sRGq3g2HbX^t>sS`0B7+#QA4T;VtW_DZgEK){XR#M>^NgTRl^;eUQWjmm{9YQ+^
zFDIB0;*?_73P=nPR3|m^C-<EsoqXibF_vj*WMUTQB6Db{TbH_P3f54Vj$Rddi-<t0
z7vcqCV4*pTULa&Id4AbTntxy+UK|D%8c<ddHdtA-3=)4{B=uCU(QQ2c*^aGUZ`eof
zugo!u^$bI~i((;iph|=GEW)nM#fGT=>nV8%&nge0S@}3&g%mp4Ts#L7L236E<I?_E
zoQ~2L)3$)+!eWs{i(E^%?j=-d<rW~Zc$0`>Qf1A>0N~0VUILXxlS>S6$|=c0+e<K;
ztpdNSz&2Qd*$PU%izv?rrhJ;IpcEIepwxierR24EUiuSAo?MnCHs+}{@mu}%?H7aQ
zPI+U(yK_Fog`^1Ylo5Nu<$<2Ikyis_HO<Id8B3#59ku9}<wQV#c^U`^wPm4lo3Fb|
zHbU0^CO6EitpU<CKBS0`^`1E`4-v*czKJc%D<sP&xS^p3Pr@S;tUcd^Sn}5ST7IuW
zQlaYxzHWh!Zdy4#AiOl-o<=?HmsS!j$12mo{ZQpmvHZU+nEma{dZ)Z9_gu5GBBKUt
zaaZ9E7^uQa7<9<=YP=TYSL3xnK%})mxZ}{L)nrNMmgY^wdzV0l<##afo6a!o9saC9
zj#`~aetd7)y)|dYS5`mSUUA}PjvppJwG^{LvyG@Bg}4HRxH3#3=mAe5Xw*}PPisga
z0%~(q!zo1e+Nq+tBTskSPS~;A@%`04wX1jTL|=8I>{y+~Zl$`iA9VK94WhA2-#v}p
zfNtAKk%H=G!CVy8WuyIdzHha<Ua($ICw~sfpVP_B^-^+ky#YO_C#!MjGW-=OTb3=l
zIeE6mu;T9do*R>|sQP+lEu)(bwofx092)5m7XJn<`l$m?_&kTO_+vzxa2DTj=(<Dn
zG9P@*S}svt_#|)J%$2K0@2=1OZtJSoFZfb@vm7tPYy;&@5zTv3MAP2b2FV-SU_hrE
zNZ}qgSb;FcDG_#F`p1@z^}!3mn-qf|_2i%TCA{VoR(>Z<I1LD=(S!p|iEzMaK;4am
z@MhyQAROJ4jS8CRH3JIQ*Ce{pqQNFyw3kh!XoF33(VWes|9;n;?Aw1){2Ow*yQNB;
zu-zKfjO5U-o%5!Td1q@{ZV5KU8pF|n7Q9*m_g5_vx2_)S)C+d#l|n%eh@aO6?N}NW
zUJ#hoBP%X~QTXO`th5d*5M5hYh%~LZ3O;K7*2<yxTS*JuYsJ<0cPpvJy;iy!_xN!8
zD!oM5x5@&S4_DQoyf!g?2wK~g04SKf(I%NiU8^}%zFO(^9akKN3LK^<6f6m$!VV4J
zVis`t<!b!Dr)bS5z!14s`m`T9-I?8|k2^ihuh<nEl`s9#2tn625G@ba5-kxfY}4!#
zwxv8rgp0Nr;o?xAi}ccv3vakB>m<69-)EPN$krb)W>)Qt|L?4?#Ci6jd%BL$nc6X3
zMmwQ1wbOK_c7A`=PUv2><NsMX>m|B<(JI^9e*4eeeq`Tq^-}JG;plF3;61+LiBL@8
zZ-%CW+T$z!1I31e*Opk*A-zGG4g>m22a%!LkOf6vv_X<_VQ_qq?a)WNdfgi~2S(4?
zHk=IgM(p~QCK~l`^hc!|{XPG4lmR?9K6nWbW9hH40FgG+cD@cu9G&s}$^DDY7?zcx
zOPhkx*P9Yj?blv?$S+rnm8szv8Ouc0EURrYn^MXumanL4EHfu3TauE@sa8v3Vq)2A
zDM{v(RE|-wi~(KV9OXW+IdC-k5$&!vfwly^=j-9K$-HmnFrYN@2T?l2D7<5oaGOXn
z_<4_Vcoe<ZU8_&!FJ=8CFaYPq;6Di%D1d0k+bh#E`FMFN85)O&F!&Y$$9up-1XKwi
z%HGqc&x0gS$j}55uMi3kh9-*f1AA0@$gfBy@pyq#VlbD0YB4@yuWB70+DL|`2t$yh
zhk#)o@GJqtF$ngVZ3K+)fJX_a@qoW4V59)fhv)AQ6mJ8SIO%r;j21%qNOlwfwH{E|
wJ3=911Q2oioU<Fj!($SUTSN(<(w~4P9FM_>)@CMn*sg0vyT*i}&-R7<5A!9rbN~PV

diff --git a/rpt_extra/hmis108_cover.jrxml b/rpt_extra/hmis108_cover.jrxml
index 429e13d786..d0acb105fb 100644
--- a/rpt_extra/hmis108_cover.jrxml
+++ b/rpt_extra/hmis108_cover.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.15.0.final using JasperReports Library version 6.15.0-dd49bfb94918336b8321d5507193f0169ead4e95  -->
+<!-- Created with Jaspersoft Studio version 6.21.2.final using JasperReports Library version 6.21.2-8434a0bd7c3bbc37cbf916f2968d35e4b165821a  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="hmis108_cover" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20" resourceBundle="hmis108_cover" whenResourceMissingType="Key" uuid="3da1a980-22df-45a2-9ff8-016d6c27b23a">
 	<property name="ireport.scriptlethandling" value="0"/>
 	<property name="ireport.encoding" value="UTF-8"/>
@@ -146,7 +146,7 @@ SELECT 	WRD_ID_A wardid,
 				<textFieldExpression><![CDATA[$R{Hmis108InpatientMonthlyReport}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy" isBlankWhenNull="false">
-				<reportElement key="textField" x="474" y="4" width="61" height="15" uuid="66f18c63-aed0-4806-ad97-5fde7cb81364"/>
+				<reportElement key="textField" x="465" y="4" width="68" height="15" uuid="66f18c63-aed0-4806-ad97-5fde7cb81364"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -159,7 +159,7 @@ SELECT 	WRD_ID_A wardid,
 				<textFieldExpression><![CDATA[$P{fromdate}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy" isBlankWhenNull="false">
-				<reportElement key="textField" x="474" y="19" width="61" height="15" uuid="f7c7b01b-7eab-4f18-a8f4-8dd22f8d946e"/>
+				<reportElement key="textField" x="464" y="19" width="69" height="15" uuid="f7c7b01b-7eab-4f18-a8f4-8dd22f8d946e"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -237,7 +237,7 @@ SELECT 	WRD_ID_A wardid,
 				<textFieldExpression><![CDATA[$R{Deaths}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="staticText-32" mode="Transparent" x="434" y="4" width="35" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="503d0d9c-893b-4c5d-9421-143e361ce871"/>
+				<reportElement key="staticText-32" mode="Transparent" x="426" y="4" width="35" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="503d0d9c-893b-4c5d-9421-143e361ce871"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -251,7 +251,7 @@ SELECT 	WRD_ID_A wardid,
 				<textFieldExpression><![CDATA[$R{From}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="staticText-33" mode="Transparent" x="434" y="19" width="35" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="504c10fa-b54c-4354-8ac6-233dd8e6986a"/>
+				<reportElement key="staticText-33" mode="Transparent" x="426" y="19" width="35" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="504c10fa-b54c-4354-8ac6-233dd8e6986a"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>

From 0b4118a7bd3e9a284636249dc9f2bc4f9a97eb68 Mon Sep 17 00:00:00 2001
From: ArnaudFofou <gui.fofou@umi2growcameroun.com>
Date: Wed, 4 Dec 2024 10:59:54 +0100
Subject: [PATCH 10/12] fix error on hmis108_adm_by_diagnosisOut report

---
 rpt_extra/hmis108_adm_by_diagnosisOut.jasper | Bin 53987 -> 54199 bytes
 rpt_extra/hmis108_adm_by_diagnosisOut.jrxml  |  30 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/rpt_extra/hmis108_adm_by_diagnosisOut.jasper b/rpt_extra/hmis108_adm_by_diagnosisOut.jasper
index 15fa56079a94f1383204997bdb083d2d09bae21f..7d88b0946f69ccd2679c549c53ee6b4bab125b17 100644
GIT binary patch
delta 8041
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

delta 7995
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

diff --git a/rpt_extra/hmis108_adm_by_diagnosisOut.jrxml b/rpt_extra/hmis108_adm_by_diagnosisOut.jrxml
index 4de1dd9cb3..7d4e66dd41 100644
--- a/rpt_extra/hmis108_adm_by_diagnosisOut.jrxml
+++ b/rpt_extra/hmis108_adm_by_diagnosisOut.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.15.0.final using JasperReports Library version 6.15.0-dd49bfb94918336b8321d5507193f0169ead4e95  -->
+<!-- Created with Jaspersoft Studio version 6.21.2.final using JasperReports Library version 6.21.2-8434a0bd7c3bbc37cbf916f2968d35e4b165821a  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="hmis108_adm_by_diagnosisOut" pageWidth="595" pageHeight="842" whenNoDataType="NoPages" columnWidth="535" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20" resourceBundle="hmis108_adm_by_diagnosisOut" whenResourceMissingType="Key" uuid="9d78b390-7df4-49d5-af10-dc4189e248c6">
 	<property name="ireport.scriptlethandling" value="0"/>
 	<property name="ireport.encoding" value="UTF-8"/>
@@ -156,7 +156,7 @@ $F{AliveFemaleAdult}.longValue()+$F{DeadFemaleAdult}.longValue())]]></variableEx
 		<band splitType="Stretch"/>
 	</background>
 	<title>
-		<band height="68" splitType="Stretch">
+		<band height="77" splitType="Stretch">
 			<textField>
 				<reportElement key="staticText-2" mode="Opaque" x="0" y="1" width="392" height="28" forecolor="#FFFFFF" backcolor="#000000" uuid="0f09694d-3bfc-43ed-82b6-1bfc09e82ddc"/>
 				<box>
@@ -196,19 +196,6 @@ $F{AliveFemaleAdult}.longValue()+$F{DeadFemaleAdult}.longValue())]]></variableEx
 				</textElement>
 				<textFieldExpression><![CDATA[$P{year}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="false">
-				<reportElement key="textField-2" x="461" y="1" width="74" height="14" uuid="7596b513-611d-4d87-a854-6d64e46c50c8"/>
-				<box leftPadding="2">
-					<topPen lineWidth="0.25" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.25" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.25" lineStyle="Solid" lineColor="#000000"/>
-				</box>
-				<textElement verticalAlignment="Middle">
-					<font fontName="DejaVu Sans" size="10" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{year}]]></textFieldExpression>
-			</textField>
 			<textField>
 				<reportElement key="staticText-19" mode="Opaque" x="393" y="1" width="69" height="14" forecolor="#FFFFFF" backcolor="#000000" uuid="21a7ba7a-9476-4ac7-a3e4-3dc0db2efe25"/>
 				<box rightPadding="2">
@@ -242,6 +229,19 @@ $F{AliveFemaleAdult}.longValue()+$F{DeadFemaleAdult}.longValue())]]></variableEx
 				</textElement>
 				<textFieldExpression><![CDATA[$R{OnlyClosedAdmissionWillBeCounted}]]></textFieldExpression>
 			</textField>
+			<textField isBlankWhenNull="false">
+				<reportElement key="textField-2" x="462" y="1" width="73" height="14" uuid="4c62c72e-7740-4c1b-8fd9-f838a56f5fa1"/>
+				<box leftPadding="2">
+					<topPen lineWidth="0.25" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.25" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.25" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement verticalAlignment="Middle">
+					<font fontName="DejaVu Sans" size="10" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{month}]]></textFieldExpression>
+			</textField>
 		</band>
 	</title>
 	<pageHeader>

From 3e01153d112efb55e79f7ed9cef835c2920faf7b Mon Sep 17 00:00:00 2001
From: David B Malkovsky <david@malkovsky.org>
Date: Wed, 4 Dec 2024 11:00:04 -0500
Subject: [PATCH 11/12] Chore: use our MessageDialog instead of
 JOptionPane.showMessageDialog() (#2100)

---
 src/main/java/org/isf/medicalstockward/gui/WardPharmacy.java | 5 ++---
 .../org/isf/medicalstockward/gui/WardPharmacyRectify.java    | 2 +-
 src/main/java/org/isf/priceslist/gui/ListBrowser.java        | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/isf/medicalstockward/gui/WardPharmacy.java b/src/main/java/org/isf/medicalstockward/gui/WardPharmacy.java
index 587ad2a2d0..eaeee96f85 100644
--- a/src/main/java/org/isf/medicalstockward/gui/WardPharmacy.java
+++ b/src/main/java/org/isf/medicalstockward/gui/WardPharmacy.java
@@ -783,8 +783,7 @@ public void focusLost(FocusEvent e) {
 						weightFrom = Integer.parseInt(jWeightFromTextField.getText());
 						if (weightTo < 0 || weightTo > 200) {
 							jWeightToTextField.setText(""); //$NON-NLS-1$
-							JOptionPane
-											.showMessageDialog(WardPharmacy.this, MessageBundle.getMessage("angal.medicalstockward.insertavalidweight")); //$NON-NLS-1$
+							MessageDialog.error(WardPharmacy.this, "angal.medicalstockward.insertavalidweight");
 						}
 					} catch (NumberFormatException ex) {
 						jWeightToTextField.setText("0"); //$NON-NLS-1$
@@ -813,7 +812,7 @@ public void focusLost(FocusEvent e) {
 						weightTo = Integer.parseInt(jWeightToTextField.getText());
 						if (weightFrom < 0) {
 							jWeightFromTextField.setText("");
-							JOptionPane.showMessageDialog(WardPharmacy.this, MessageBundle.getMessage("angal.medicalstockward.insertavalidweight"));
+							MessageDialog.error(WardPharmacy.this, "angal.medicalstockward.insertavalidweight");
 						}
 					} catch (NumberFormatException ex) {
 						jWeightFromTextField.setText("0");
diff --git a/src/main/java/org/isf/medicalstockward/gui/WardPharmacyRectify.java b/src/main/java/org/isf/medicalstockward/gui/WardPharmacyRectify.java
index 7264a6f36e..bdc0a51b6f 100644
--- a/src/main/java/org/isf/medicalstockward/gui/WardPharmacyRectify.java
+++ b/src/main/java/org/isf/medicalstockward/gui/WardPharmacyRectify.java
@@ -376,7 +376,7 @@ private void initComponents() {
 			double movQuantity = lotQty - newQty;
 
 			if (movQuantity == 0. || newQty < 0) {
-				JOptionPane.showMessageDialog(this, MessageBundle.getMessage("angal.medicalstockward.rectify.pleaseinsertavalidvalue"));
+				MessageDialog.error(this, "angal.medicalstockward.rectify.pleaseinsertavalidvalue");
 				return;
 			}
 			if (newQty == 0.) {
diff --git a/src/main/java/org/isf/priceslist/gui/ListBrowser.java b/src/main/java/org/isf/priceslist/gui/ListBrowser.java
index 898c481497..00ec407d66 100644
--- a/src/main/java/org/isf/priceslist/gui/ListBrowser.java
+++ b/src/main/java/org/isf/priceslist/gui/ListBrowser.java
@@ -116,7 +116,7 @@ private JButton getJButtonDelete() {
 			jButtonDelete.setMnemonic(MessageBundle.getMnemonic("angal.common.delete.btn.key"));
 			jButtonDelete.addActionListener(actionEvent -> {
 				if (jTablePriceLists.getSelectedRow() < 0) {
-					JOptionPane.showMessageDialog(null, MessageBundle.getMessage("angal.priceslist.pleaseselectalisttodelete"));
+					MessageDialog.error(null, "angal.priceslist.pleaseselectalisttodelete");
 				} else {
 					if (jTablePriceLists.getRowCount() == 1) {
 						MessageDialog.error(null, "angal.priceslist.sorryatleastonelist");

From 9d23f809f0da71eb5df6754f9f89a5cd45048e20 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Dec 2024 20:24:39 +0000
Subject: [PATCH 12/12] Chore(deps): Bump
 org.apache.maven.plugins:maven-surefire-plugin

Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.5.1 to 3.5.2.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.1...surefire-3.5.2)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2c73b6ab6d..889a7b95ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.5.1</version>
+				<version>3.5.2</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>