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

Merge for release 1.14.2 #1332

Merged
merged 11 commits into from
May 16, 2024
Merged

Merge for release 1.14.2 #1332

merged 11 commits into from
May 16, 2024

Conversation

mwithi
Copy link
Member

@mwithi mwithi commented May 14, 2024

Release notes - Open Hospital - 1.14.2

Bug Fixes

OP-1208 Fix SQL scripts for update and French CSV
OP-1226 Fix MedicalBrowser style and filtering

New Features

OP-1225 Allow to change MedicalType on existing Medicals

Improvements

OP-1219 Add Ward comparator to sort in combobox
OP-1220 Add Supplier comparator to sort in combobox
OP-1221 Improve filtering for all charge or discharge MovementType(s)
OP-1222 ProductLedger improvements
OP-1223 Improve Pharmaceutical Stock label and graphics
OP-1224 Add Reset button for Pharmaceutical Stock filter
OP-1227 Show 2 decimals only for prices in Pharmaceutical Stock
OP-1228 Add product code column to Pharmaceutical Stock
OP-1229 Medicals sorted by name in Pharmaceutical Stock

mwithi added 11 commits May 10, 2024 18:55
@mwithi
Remove hardcoded database name from sql scripts
fc5bf4a
@mwithi
Restore standard tables names for sql script
4e1ea31 
(capitalized without backticks)
@mwithi
Restore standard fields names for sql scripts
8b490de 
(without backticks)
@mwithi
Fix update script
3e8d431
@mwithi
OP-1208 Fix French CSV
98e1633
@mwithi
OP-1219 Add Ward comparator to sort in combobox (#1328)
c0202e8 
* OP-1219 Add Ward comparator to sort in combobox

* Remove unnecessary comparator (so far) and using Apache Commons compare
@mwithi
OP-1220 Add Supplier comparator to sort in combobox (#1330)
9ceab04 
* OP-1220 Add Supplier comparator to sort in combobox

* Replace compareTo with Apache Commons compare

* Organize imports
@mwithi
OP-1221 Improve filtering for all charge or discharge MovementType(s) (…
a578132 
…#1329)
@mwithi
Update version in pom
8e32c23
@mwithi
Update license headers
9aed20f
@mwithi
Remove -SNAPSHOT before release
2760a09
@mwithi mwithi changed the title Release 1.14.2 Merge for release 1.14.2 May 14, 2024
@mwithi mwithi requested a review from dbmalkovsky May 14, 2024 21:12
mwithi
mwithi commented May 14, 2024
View reviewed changes
sql/step_a105_add_inventory_sub_menu_in_pharmacy.sql
Copy link
Member Author

@mwithi mwithi May 14, 2024 •
edited

Choose a reason for hiding this comment

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

I don't know why this is like this, but it should be merged with step_a104 I guess... but we will do it on develop directly

dbmalkovsky
dbmalkovsky approved these changes May 15, 2024
View reviewed changes
Copy link
Collaborator

@dbmalkovsky dbmalkovsky left a comment

Choose a reason for hiding this comment

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

LGTM

@mwithi mwithi merged commit f919432 into master May 16, 2024
2 checks passed
@mwithi mwithi deleted the release_1_14_2 branch May 16, 2024 14:49
@mwithi mwithi restored the release_1_14_2 branch May 16, 2024 14:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dbmalkovsky dbmalkovsky dbmalkovsky approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@mwithi @dbmalkovsky