OP-1332 OP-1199 OP-1200 Pharmacy Inventory feature#2127

Open

mwithi wants to merge 341 commits intodevelopfrom OP-1332_OP-1199_OP-1200

+7,081-119

This pull request is big! We're only showing the most recent 250 commits

Commits on Jul 25, 2024

Commits on Aug 6, 2024

Merge branch 'develop' into OP-1199 -Main-Store-Inventory
loique70
committed

Commits on Aug 8, 2024

Merge branch 'develop' into OP-1303
ArnaudFonzam
committed

Commits on Aug 9, 2024

add color to the status label
ArnaudFonzam
committed
src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java
ArnaudFonzam
committed

Commits on Aug 20, 2024

Merge branch 'develop' into OP-1302
ArnaudFonzam
committed
Make JTable sortable in edit inventory
ArnaudFonzam
committed

Commits on Aug 21, 2024

Add printing method
loique70
committed

Commits on Sep 2, 2024

Merge pull request #2047 from informatici/develop
mwithi
authored

Commits on Sep 4, 2024

Commits on Sep 12, 2024

Commits on Sep 13, 2024

Merge branch 'develop' into OP-1302
ArnaudFonzam
committed
fix bug on column unit price and total price
ArnaudFonzam
committed

Commits on Sep 23, 2024

Merge pull request #2041 from ArnaudFonzam/OP-1302
mwithi
authored

Commits on Sep 24, 2024

Merge pull request #2054 from informatici/develop
mwithi
authored

Commits on Oct 2, 2024

Merge pull request #2059 from informatici/develop
mwithi
authored

Commits on Oct 4, 2024

Commits on Nov 6, 2024

Merge branch 'develop' of into OP-1193_OP-1194_OP-1197
JantBogard
committed

Commits on Nov 7, 2024

Commits on Nov 8, 2024

Applying suggestion changing
JantBogard
committed

Commits on Nov 13, 2024

Merge branch 'OP-1200 -Wards-Inventory' into OP-1193_OP-1194_OP-1197
JantBogard
committed

Commits on Nov 14, 2024

Applying suggestion for change
JantBogard
committed

Commits on Nov 15, 2024

Commits on Nov 19, 2024

Commits on Nov 20, 2024

Commits on Nov 21, 2024

Commits on Nov 22, 2024

Merge branch 'develop' into OP-1304
ArnaudFofou
committed
Merge branch 'informatici:develop' into OP-1304
ArnaudFofou
authored
Update InventoryEdit.java
ArnaudFofou
authored
Update InventoryEdit.java
ArnaudFofou
authored
update src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java
ArnaudFofou
committed
Merge branch 'OP-1304 ' of https://github.com/ArnaudFofou/openhospital-gui into OP-1304
ArnaudFofou
committed
Applying suggestion for change
JantBogard
committed
Applying suggestion for change
JantBogard
committed
update InventoryEdit
ArnaudFofou
committed
Applying suggestion for change
JantBogard
committed

Commits on Nov 26, 2024

Update src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java

ArnaudFofou
and
dbmalkovsky
authored
Update src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java

ArnaudFofou
and
dbmalkovsky
authored
Update src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java

ArnaudFofou
and
dbmalkovsky
authored
Update src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java

ArnaudFofou
and
dbmalkovsky
authored
apply suggestion
ArnaudFofou
committed
Merge branch 'OP-1304 ' of https://github.com/ArnaudFofou/openhospital-gui into OP-1304
ArnaudFofou
committed
Fix format issues
JantBogard
committed
Merge branch 'develop' into OP-1193_OP-1194_OP-1197
JantBogard
committed
apply suggestion
ArnaudFofou
committed
Fix format issues
JantBogard
committed
apply suggestion
ArnaudFofou
committed
enhance strategie to fetch medicals
ArnaudFofou
committed

Commits on Nov 27, 2024

Commits on Nov 28, 2024

Commits on Nov 29, 2024

apply suggestion
ArnaudFofou
committed
Update src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java

ArnaudFofou
and
mwithi
authored

Commits on Dec 3, 2024

OP-1368 | Make Inventory status language independent (#2098 )

ArnaudFofou
and
ArnaudFofou
authored
Update src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java

ArnaudFofou
and
dbmalkovsky
authored
apply suggestion
ArnaudFofou
committed
Merge branch 'develop' into OP-1304
ArnaudFofou
committed
fix conflict
ArnaudFofou
committed
apply suggestion
ArnaudFofou
committed
apply suggestion
ArnaudFofou
committed

Commits on Dec 4, 2024

Applying a few change
JantBogard
committed

Commits on Dec 5, 2024

fix suggestion
ArnaudFofou
committed

Commits on Dec 6, 2024

update src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java
ArnaudFofou
committed
enhance the logic of Select Button
ArnaudFofou
committed

Commits on Dec 7, 2024

Merge branch 'develop' into OP-1200 -Wards-Inventory
mwithi
committed

Commits on Dec 8, 2024

Commits on Dec 9, 2024

update src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java'
ArnaudFofou
committed
remove unused import
ArnaudFofou
committed
update src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java'
ArnaudFofou
committed
update src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java'
ArnaudFofou
committed

Commits on Dec 11, 2024

Commits on Dec 20, 2024

Improve cell rendering
mwithi
committed
Fix typo
mwithi
committed
Improve cell rendering in browser
mwithi
committed
Change columns headers
mwithi
committed
Refactor variables
mwithi
committed
Standardize bundles
mwithi
committed
enhance product selection
ArnaudFofou
committed
Merge branch 'OP-1199 -Main-Store-Inventory' into OP-1304
ArnaudFofou
authored
update src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java
ArnaudFofou
committed
Merge branch 'OP-1304 ' of https://github.com/ArnaudFofou/openhospital-gui into OP-1304
ArnaudFofou
committed
enhance code and avoid duplicated instruction
ArnaudFofou
committed
Fixed bugs
JantBogard
committed

Commits on Dec 23, 2024

Commits on Dec 24, 2024

Restore PAGE_SIZE
mwithi
committed

Commits on Dec 26, 2024

Fixed bugs
JantBogard
committed

Commits on Dec 28, 2024

Commits on Jan 9, 2025

Commits on Jan 10, 2025

update the message bundle
ArnaudFofou
committed
enhance the code
ArnaudFofou
committed
update src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java
ArnaudFofou
committed
Fix unpredicted inventoryEdit close behavior
JantBogard
committed
update checkParam method
ArnaudFofou
committed

Commits on Jan 13, 2025

Commits on Jan 14, 2025

disable codeTextField and selectButton on edit mode
ArnaudFofou
committed
check if something has been update after action confirm'
ArnaudFofou
committed
update the date of the Licence
ArnaudFofou
committed
update the date of the Licence
ArnaudFofou
committed
update the status if the table is not actualise during validation
ArnaudFofou
committed
Merge pull request #2115 from ArnaudFofou/OP-1376
mwithi
authored
Merge branch 'OP-1199 -Main-Store-Inventory' into OP-1199_small_improvements
mwithi
authored
Merge pull request #2085 from JantBogard/OP-1193_OP-1194_OP-1197
mwithi
authored
Merge pull request #2107 from mwithi/OP-1199_small_improvements
mwithi
authored

Commits on Jan 15, 2025

Fix total cost calculation as it is BigDecimal now
mwithi
committed
add button confirm and implement the logic of that button
ArnaudFofou
committed
update message bundle and the logic for confirmButton
ArnaudFofou
committed
Update bundle/language_en.properties

ArnaudFofou
and
dbmalkovsky
authored
Update bundle/language_en.properties

ArnaudFofou
and
dbmalkovsky
authored
Update bundle/language_en.properties

ArnaudFofou
and
dbmalkovsky
authored
update bundle/language_en.properties
ArnaudFofou
committed
Merge branch 'OP-1376 ' of https://github.com/ArnaudFofou/openhospital-gui into OP-1376
ArnaudFofou
committed
update the licence date
ArnaudFofou
committed
Merge pull request #2120 from informatici/develop
mwithi
authored
OP-1195 | Print ward Inventory (#2119 )
JantBogard
authored

Commits on Jan 18, 2025

add possibility to choose lot during inventory
ArnaudFofou
committed

Commits on Jan 20, 2025

Commits on Jan 21, 2025

Merge branch 'OP-1376 ' of https://github.com/ArnaudFofou/openhospital-gui into OP-1376
ArnaudFofou
committed

Commits on Jan 22, 2025

fix buggs
ArnaudFofou
committed
fix null pointer exception
ArnaudFofou
committed
change lot.getMainStoreQuantity() to lot.getWardsTotalQuantity()
ArnaudFofou
committed
fix bug
ArnaudFofou
committed

Commits on Jan 23, 2025

remove column qty and not on the lot table
ArnaudFofou
committed
Merge pull request #2118 from ArnaudFofou/OP-1376
mwithi
authored

Commits on Jan 24, 2025

Commits on Jan 29, 2025

Commits on Jan 30, 2025

Commits on Jan 31, 2025

Commits on Feb 3, 2025

Fix ward selection
mwithi
committed