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-1186 View Inventory #2028

Merged
merged 43 commits into from
Jul 25, 2024
Merged

OP-1186 View Inventory #2028

merged 43 commits into from
Jul 25, 2024

Conversation

ArnaudFonzam
Copy link
Contributor

@ArnaudFonzam ArnaudFonzam commented Jul 25, 2024 •
edited by mwithi
Loading

See OP-1186.

ArnaudFonzam and others added 30 commits March 20, 2024 16:19
start with update issue
26619f4
update src/main/java/org/isf/medicalinventory/gui/InventoryBrowser.java
005d4c9
Merge branch 'OP-1184' into OP-1185
d3763b4
start with update inventory
b786632
add method to update medical inventory
fdf1285
update src/main/java/org/isf/medicalinventory/gui/InventoryBrowser.java
0a989e9
use the good Message Dialog
e8681b1
update bundle/language_en.properties
2a127bd
@ArnaudFonzam @dbmalkovsky
Update src/main/java/org/isf/medicalinventory/gui/InventoryBrowser.java
229b89b 
Co-authored-by: David B Malkovsky <[email protected]>
@ArnaudFonzam @dbmalkovsky
Update bundle/language_en.properties
054684d 
Co-authored-by: David B Malkovsky <[email protected]>
@ArnaudFonzam @dbmalkovsky
Update bundle/language_en.properties
44983bc 
Co-authored-by: David B Malkovsky <[email protected]>
@ArnaudFonzam @dbmalkovsky
Update bundle/language_en.properties
1eb248e 
Co-authored-by: David B Malkovsky <[email protected]>
@ArnaudFonzam @dbmalkovsky
Update bundle/language_en.properties
9dcecfe 
Co-authored-by: David B Malkovsky <[email protected]>
@ArnaudFonzam @dbmalkovsky
Update bundle/language_en.properties
80cb3f3 
Co-authored-by: David B Malkovsky <[email protected]>
@ArnaudFonzam @dbmalkovsky
Update src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java
d692a57 
Co-authored-by: David B Malkovsky <[email protected]>
apply changes
255dc60
update the variable type on InventoryEdit and update bundle/language_…
237e685 
…en.properties
add possibility to view inventory
94c384d
Merge branch 'develop' into OP-1186
139d518
Merge branch 'develop' into OP-1186
64d5c50
add new field'
04ba3ab
@dbmalkovsky
OP-1278 resource bundle addition (informatici#2015)
41d00f8
@dbmalkovsky
Chore: update Intellij settings to match Eclipse (informatici#2019)
d0f2e01
@dependabot
Chore(deps): Bump org.apache.maven.plugins:maven-surefire-plugin
c62a846 
Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.2.5 to 3.3.0.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](apache/maven-surefire@surefire-3.2.5...surefire-3.3.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
@dbmalkovsky
Hibernate renamed org.hibernate.type to org.hibernate.orm.jdbc.bind (i…
b8b66ff 
…nformatici#2021)
@dependabot
Chore(deps): Bump org.apache.maven.plugins:maven-jar-plugin
14fefeb 
Bumps [org.apache.maven.plugins:maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.4.1 to 3.4.2.
- [Release notes](https://github.com/apache/maven-jar-plugin/releases)
- [Commits](apache/maven-jar-plugin@maven-jar-plugin-3.4.1...maven-jar-plugin-3.4.2)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-jar-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@dbmalkovsky
Merge pull request informatici#2022 from informatici/dependabot/maven…
894460a 
…/org.apache.maven.plugins-maven-jar-plugin-3.4.2

Chore(deps): Bump org.apache.maven.plugins:maven-jar-plugin from 3.4.1 to 3.4.2
@dbmalkovsky
Merge pull request informatici#2020 from informatici/dependabot/maven…
730ca0c 
…/org.apache.maven.plugins-maven-surefire-plugin-3.3.0

Chore(deps): Bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.5 to 3.3.0
@dependabot
Chore(deps-dev): Bump org.junit.jupiter:junit-jupiter-engine
802e5c2 
Bumps [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.10.2 to 5.10.3.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit5@r5.10.2...r5.10.3)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@dbmalkovsky
Merge pull request informatici#2024 from informatici/dependabot/maven…
49302c4 
…/org.junit.jupiter-junit-jupiter-engine-5.10.3

Chore(deps-dev): Bump org.junit.jupiter:junit-jupiter-engine from 5.10.2 to 5.10.3
dependabot bot and others added 12 commits July 6, 2024 19:58
@dependabot
Chore(deps-dev): Bump org.assertj:assertj-core from 3.25.3 to 3.26.0
04cad6c 
Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.0.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](assertj/assertj@assertj-build-3.25.3...assertj-build-3.26.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot
Chore(deps): Bump org.apache.maven.plugins:maven-dependency-plugin
77b3d83 
Bumps [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.6.1 to 3.7.1.
- [Release notes](https://github.com/apache/maven-dependency-plugin/releases)
- [Commits](apache/maven-dependency-plugin@maven-dependency-plugin-3.6.1...maven-dependency-plugin-3.7.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-dependency-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
@dbmalkovsky
Merge pull request informatici#2011 from informatici/dependabot/maven…
f7ee54e 
…/org.assertj-assertj-core-3.26.0

Chore(deps-dev): Bump org.assertj:assertj-core from 3.25.3 to 3.26.0
@dbmalkovsky
Merge pull request informatici#2023 from informatici/dependabot/maven…
bb20adf 
…/org.apache.maven.plugins-maven-dependency-plugin-3.7.1

Chore(deps): Bump org.apache.maven.plugins:maven-dependency-plugin from 3.6.1 to 3.7.1
@dependabot
Chore(deps-dev): Bump org.assertj:assertj-core from 3.26.0 to 3.26.3
f153d0e 
Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.0 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](assertj/assertj@assertj-build-3.26.0...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@dbmalkovsky
Merge pull request informatici#2025 from informatici/dependabot/maven…
e32e243 
…/org.assertj-assertj-core-3.26.3

Chore(deps-dev): Bump org.assertj:assertj-core from 3.26.0 to 3.26.3
@dependabot
Chore(deps): Bump org.apache.maven.plugins:maven-surefire-plugin
2b49478 
Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.3.0 to 3.3.1.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](apache/maven-surefire@surefire-3.3.0...surefire-3.3.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@dbmalkovsky
Merge pull request informatici#2026 from informatici/dependabot/maven…
53f306a 
…/org.apache.maven.plugins-maven-surefire-plugin-3.3.1

Chore(deps): Bump org.apache.maven.plugins:maven-surefire-plugin from 3.3.0 to 3.3.1
@mwithi @dbmalkovsky
OP-1301-fix-units-packets-management-in-main-store (informatici#2027)
37499d7 
* Improve quantity check for single lot

* Add exception for AUTOMATICLOT_OUT case

* Apply project standards

* Deprecate initialQty

* Apply suggestions from code review

---------

Co-authored-by: David B Malkovsky <[email protected]>
fix conflict
041f07b
fix error
30569a8
update bundle/language_en.properties
caa7621
@mwithi mwithi changed the title Op 1186 OP-1186 View Inventory Jul 25, 2024
mwithi
mwithi approved these changes Jul 25, 2024
View reviewed changes
Copy link
Member

@mwithi mwithi left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks a lot!

@mwithi mwithi merged commit db8149d into informatici:OP-1199-Main-Store-Inventory Jul 25, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mwithi mwithi mwithi approved these changes

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

Successfully merging this pull request may close these issues.
3 participants
@ArnaudFonzam @mwithi @dbmalkovsky