Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OP-1199 Main store inventory #2125

Merged
merged 202 commits into from
Jan 28, 2025
Merged

OP-1199 Main store inventory #2125

merged 202 commits into from
Jan 28, 2025

Conversation

mwithi
Copy link
Member

@mwithi mwithi commented Jan 23, 2025

See OP-1199.
Changes in core should be fine.

ArnaudFonzam and others added 30 commits February 28, 2024 10:11
add Inventory Browser
ff77b25
remove comment
cbf837a
use best pratique on the codeé
618bca2
applied the suggestion
c2304b3
update the enum and apply changes
cab1b34
@mwithi
Merge pull request #1969 from ArnaudFonzam/OP-1182
c7eb2fc 
OP-1182 | Add Window to Manage global Inventory
add inventoryEdit Browser
5cc63d4
add window to manage inventory
51286f9
remove comment
dfa13b7
fix error
f694ed5
add button and action to save inventory
c9873ab
@ArnaudFonzam @dbmalkovsky
Update src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java
6fcd4fa 
Co-authored-by: David B Malkovsky <[email protected]>
@ArnaudFonzam @dbmalkovsky
Update src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java
a2c7fed 
Co-authored-by: David B Malkovsky <[email protected]>
@ArnaudFonzam @dbmalkovsky
Update src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java
bfa672b 
Co-authored-by: David B Malkovsky <[email protected]>
@ArnaudFonzam @dbmalkovsky
Update src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java
fcd24d8 
Co-authored-by: David B Malkovsky <[email protected]>
@ArnaudFonzam @dbmalkovsky
Update src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java
a23441f 
Co-authored-by: David B Malkovsky <[email protected]>
update src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java
cbbec64
Merge branch 'OP-1183' of https://github.com/ArnaudFonzam/openhospita…
b50e16b 
…l-gui into OP-1183
fix column to upper case
6d1ffcf
update message error
3b318a9
remove the method that are not use yet
a1125cc
change column drugs by products
830a2de
update src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java
b91f549
update the extension of oh_loader
5cc9a38
remove loader icon
f8eeefd
update bundle/language_en.properties
51afe65
Merge remote-tracking branch 'upstream/OP-1199-Main-Store-Inventory' …
f47fe88 
…into OP-1183
remove non use key in bundler
ed93ab5
remove non use key in bundler
2680fa5
update bundle/language_en.properties
9414d8c
dbmalkovsky
dbmalkovsky reviewed Jan 28, 2025
View reviewed changes
Copy link
Collaborator

@dbmalkovsky dbmalkovsky left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added about 32 more comments

@mwithi
Copy link
Member Author

mwithi commented Jan 28, 2025

Added about 32 more comments

So far, all done. Thanks!

@mwithi mwithi requested a review from dbmalkovsky January 28, 2025 20:29
@mwithi mwithi changed the base branch from develop to OP-1332_OP-1199_OP-1200 January 28, 2025 21:12
@mwithi mwithi merged commit 1b84c9a into OP-1332_OP-1199_OP-1200 Jan 28, 2025
2 checks passed
@mwithi mwithi deleted the OP-1199-Main-Store-Inventory branch January 28, 2025 21:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dbmalkovsky dbmalkovsky Awaiting requested review from dbmalkovsky

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@mwithi @dbmalkovsky @ArnaudFonzam @JantBogard @ArnaudFofou