informatici · mwithi · Jul 25, 2024 · Jul 25, 2024 · Aug 6, 2024 · Aug 8, 2024
diff --git a/bundle/language_en.properties b/bundle/language_en.properties
diff --git a/rpt_base/Inventory.jasper b/rpt_base/Inventory.jasper
diff --git a/rpt_base/Inventory.jrxml b/rpt_base/Inventory.jrxml
diff --git a/rpt_base/Inventory.properties b/rpt_base/Inventory.properties
@@ -0,0 +1,25 @@
+#Generated by Eclipse Messages Editor (Eclipse Babel)
+
+Inventory = Inventory
+
+Code  = Code
+
+Status = Status
+
+Reference = Reference
+
+InventoryDate = Inventory Date
+
+MainStoreInventoryID = MAIN STORE INVENTORY ID
+
+Designation = Designation
+
+LotCode= Lot Code
+
+DueDate = Due Date
+
+TheoreticQuantity = Theoretic Quantity
+
+RealQuantity = Real Quantity
+
+
diff --git a/rpt_base/InventoryWard.jasper b/rpt_base/InventoryWard.jasper
diff --git a/rpt_base/InventoryWard.jrxml b/rpt_base/InventoryWard.jrxml
diff --git a/rpt_base/InventoryWard.properties b/rpt_base/InventoryWard.properties
@@ -0,0 +1,25 @@
+#Generated by Eclipse Messages Editor (Eclipse Babel)
+
+Inventory = Inventory
+
+Code  = Code
+
+Status = Status
+
+Reference = Reference
+
+InventoryDate = Inventory Date
+
+WardInventoryID = Ward INVENTORY ID
+
+Designation = Designation
+
+LotCode= Lot Code
+
+DueDate = Due Date
+
+TheoreticQuantity = Theoretic Quantity
+
+RealQuantity = Real Quantity
+
+
diff --git a/rpt_base/InventoryWard_en.properties b/rpt_base/InventoryWard_en.properties
@@ -0,0 +1,25 @@
+#Generated by Eclipse Messages Editor (Eclipse Babel)
+
+Inventory = Inventory
+
+Code  = Code
+
+Status = Status
+
+Reference = Reference
+
+InventoryDate = Inventory Date
+
+WardInventoryID = WARD INVENTORY ID
+
+Designation = Designation
+
+LotCode= Lot Code
+
+DueDate = Due Date
+
+TheoreticQuantity = Theoretic Quantity
+
+RealQuantity = Real Quantity
+
+
diff --git a/rpt_base/Inventory_en.properties b/rpt_base/Inventory_en.properties
@@ -0,0 +1,25 @@
+#Generated by Eclipse Messages Editor (Eclipse Babel)
+
+Inventory = Inventory
+
+Code  = Code
+
+Status = Status
+
+Reference = Reference
+
+InventoryDate = Inventory Date
+
+MainStoreInventoryID = MAIN STORE INVENTORY ID
+
+Designation = Designation
+
+LotCode= Lot Code
+
+DueDate = Due Date
+
+TheoreticQuantity = Theoretic Quantity
+
+RealQuantity = Real Quantity
+
+
diff --git a/rsc/log4j2-spring.properties.dist b/rsc/log4j2-spring.properties.dist
@@ -47,6 +47,12 @@ appender.jdbc.columnConfigs[2].name = MESSAGE
 appender.jdbc.columnConfigs[2].pattern = %mm%ex%n
 appender.jdbc.columnConfigs[2].isUnicode = false
 
+# Security settings - see log4j CVE-2021-44228
+log4j.formatMsgNoLookups=true 
+-
+# Assigning appenders to packages (application loggers)
+log4j.logger.org.isf=LOG_LEVEL,RollingFile
+log4j.additivity.org.isf = false
 
 # Assigning appenders to Hibernate packages (DB loggers)
 # - hibernate.SQL to DEBUG for SQL queries to be logged

diff --git a/src/main/java/org/isf/admission/gui/AdmittedPatientBrowser.java b/src/main/java/org/isf/admission/gui/AdmittedPatientBrowser.java
@@ -1040,7 +1040,7 @@ private JButton getButtonMerge() {
 
 			// ASK CONFIRMATION
 			int ok = MessageDialog.yesNo(this,
-							"angal.admission.withthisoperationthepatientwillbedeletedandhisherhistorytransferedtothepatient.fmt.msg", patient2.getCode(),
+							"angal.admission.withthisoperationthepatientwillbedeletedandthehistorytransferredtothepatient.fmt.msg", patient2.getCode(),
 							patient2.getName(), patient2.getAge(), patient2.getAddress(), mergedPatient.getCode(), mergedPatient.getName(),
 							mergedPatient.getAge(), mergedPatient.getAddress());
 			if (ok != JOptionPane.YES_OPTION) {

diff --git a/src/main/java/org/isf/anamnesis/gui/PatientHistoryEdit.java b/src/main/java/org/isf/anamnesis/gui/PatientHistoryEdit.java
@@ -781,7 +781,7 @@ private JCheckBox getJCheckBoxPathClosedOrto() {
 		if (jCheckBoxPathClosedOrto == null) {
 			jCheckBoxPathClosedOrto = new JCheckBox();
 			jCheckBoxPathClosedOrto.setAction(getActionExcludePathClosedNothing());
-			jCheckBoxPathClosedOrto.setText(MessageBundle.getMessage("angal.anamnesis.closed.orto.txt")); //$NON-NLS-1$
+			jCheckBoxPathClosedOrto.setText(MessageBundle.getMessage("angal.anamnesis.closed.ortho.txt")); //$NON-NLS-1$
 		}
 		return jCheckBoxPathClosedOrto;
 	}
@@ -826,7 +826,7 @@ private JCheckBox getJCheckBoxPathClosedCardio() {
 		if (jCheckBoxPathClosedCardio == null) {
 			jCheckBoxPathClosedCardio = new JCheckBox();
 			jCheckBoxPathClosedCardio.setAction(getActionExcludePathClosedNothing());
-			jCheckBoxPathClosedCardio.setText(MessageBundle.getMessage("angal.anamnesis.closed.cardiovascolaris.txt")); //$NON-NLS-1$
+			jCheckBoxPathClosedCardio.setText(MessageBundle.getMessage("angal.anamnesis.closed.cardiovascular.txt")); //$NON-NLS-1$
 		}
 		return jCheckBoxPathClosedCardio;
 	}

diff --git a/src/main/java/org/isf/examination/gui/PatientExaminationEdit.java b/src/main/java/org/isf/examination/gui/PatientExaminationEdit.java
@@ -1,6 +1,6 @@
 /*
  * Open Hospital (www.open-hospital.org)
- * Copyright © 2006-2024 Informatici Senza Frontiere ([email protected])
+ * Copyright © 2006-2025 Informatici Senza Frontiere ([email protected])
  *
  * Open Hospital is a free and open source software for healthcare data management.
  *

diff --git a/src/main/java/org/isf/lab/gui/LabBrowser.java b/src/main/java/org/isf/lab/gui/LabBrowser.java
@@ -1,6 +1,6 @@
 /*
  * Open Hospital (www.open-hospital.org)
- * Copyright © 2006-2023 Informatici Senza Frontiere ([email protected])
+ * Copyright © 2006-2025 Informatici Senza Frontiere ([email protected])
  *
  * Open Hospital is a free and open source software for healthcare data management.
  *