fix NullPointerexception

informatici · Nov 19, 2024 · bc799e2 · bc799e2
1 parent 7f0556b
commit bc799e2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/bundle/language_en.properties b/bundle/language_en.properties
@@ -1197,6 +1197,7 @@ angal.newbill.payment.btn.key
 angal.newbill.paymentmadebeforebilldate.msg                                                            = Payment made before bill date.
 angal.newbill.paymentreceipt.btn                                                                       = Payment Receipt
 angal.newbill.paymentreceipt.btn.key                                                                   = N
+angal.newbill.pleasefindpatientbeforeremotehim.msg                                                     = Please find patient first before remove him.
 angal.newbill.pleaseinsertanameforthepatient.msg                                                       = Please insert a name for the patient.
 angal.newbill.pleaseselectanitem.txt                                                                   = Please select an item.
 angal.newbill.refund.btn                                                                               = Refund

diff --git a/src/main/java/org/isf/accounting/gui/PatientBillEdit.java b/src/main/java/org/isf/accounting/gui/PatientBillEdit.java
@@ -821,6 +821,7 @@ private JPanel getJPanelDate() {
 			jPanelDate.add(getJCalendarDate());
 			jPanelDate.add(getJButtonPickPatient());
 			jPanelDate.add(getJButtonTrashPatient());
+
 			if (!GeneralData.getGeneralData().getSINGLEUSER()) {
 				jPanelDate.add(getJLabelUser());
 			}
@@ -846,18 +847,20 @@ private JButton getJButtonTrashPatient() {
 			jButtonTrashPatient.setIcon(new ImageIcon("rsc/icons/remove_patient_button.png"));
 			jButtonTrashPatient.setToolTipText(MessageBundle.getMessage("angal.newbill.removethepatientassociatedwiththisbill.tooltip"));
 			jButtonTrashPatient.addActionListener(actionEvent -> {
-				// BILL
-				thisBill.setBillPatient(null);
-				thisBill.setIsPatient(false);
-				thisBill.getBillPatient().setCode(0);
-				thisBill.setPatName(""); //$NON-NLS-1$
-				thisBill.setAdmission(null);
-				// INTERFACE
-				jTextFieldPatient.setText("");
-				jTextFieldPatient.setEditable(false);
-				jButtonPickPatient.setText(MessageBundle.getMessage("angal.newbill.findpatient.btn"));
-				jButtonPickPatient.setToolTipText(MessageBundle.getMessage("angal.newbill.associateapatientwiththisbill.tooltip"));
-				jButtonTrashPatient.setEnabled(false);
+				if (thisBill.getBillPatient() != null) {
+					// BILL
+					thisBill.setBillPatient(null);
+					thisBill.setIsPatient(false);
+					thisBill.setPatName(""); //$NON-NLS-1$
+					thisBill.setAdmission(null);
+					// INTERFACE
+					jTextFieldPatient.setText("");
+					jTextFieldPatient.setEditable(false);
+					jButtonPickPatient.setText(MessageBundle.getMessage("angal.newbill.findpatient.btn"));
+					jButtonPickPatient.setToolTipText(MessageBundle.getMessage("angal.newbill.associateapatientwiththisbill.tooltip"));
+				} else {
+					MessageDialog.info(null, MessageBundle.getMessage("angal.newbill.pleasefindpatientbeforeremotehim.msg"));
+				}
 			});
 		}
 		return jButtonTrashPatient;