Merge pull request #2125 from informatici/OP-1199-Main-Store-Inventory

OP-1199 Main store inventory
informatici · Jan 28, 2025 · 1b84c9a · 1b84c9a
2 parents 53256f8 + cf55d03
commit 1b84c9a
Show file tree

Hide file tree

Showing 21 changed files with 4,051 additions and 29 deletions.
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/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/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 (info@informaticisenzafrontiere.org)
+ * Copyright © 2006-2025 Informatici Senza Frontiere (info@informaticisenzafrontiere.org)
  *
  * 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 (info@informaticisenzafrontiere.org)
+ * Copyright © 2006-2025 Informatici Senza Frontiere (info@informaticisenzafrontiere.org)
  *
  * Open Hospital is a free and open source software for healthcare data management.
  *