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

V2.4.1 #5778

Merged
merged 105 commits into from
Dec 12, 2024
Merged

V2.4.1 #5778

merged 105 commits into from
Dec 12, 2024

Conversation

lache-melvin
Copy link
Contributor

@lache-melvin lache-melvin commented Dec 12, 2024 •
edited
Loading

Merge 2.4.1 into main

👩🏻‍💻 What does this PR do?

Item categories + JSON form prescription picker

Some reports changes?

💌 Any notes for the reviewer?

🧪 Testing

📃 Documentation

  • Part of an epic: documentation will be completed for the feature as a whole
  • No documentation required: no user facing changes or a bug fix which isn't a change in behaviour
  • These areas should be updated or checked:
    1.
    2.

lache-melvin and others added 30 commits November 7, 2024 10:39
@lache-melvin
bump package version
5f6e1eb
@lache-melvin
add migrations for item categories
5650203
@lache-melvin
Merge branch 'develop' into v2.4.1
54d34e5
@lache-melvin
Merge branch 'v2.4.1' into 5330-category-tables
6d3780b
@lache-melvin
item category row repositories
221853b
@lache-melvin
fix comment
2b3b47b
@lache-melvin
move to categories folder
4cb589f
@lache-melvin
add category group
8fd527f
@lache-melvin
remove category group
7f813ff
@lache-melvin
add KDD for item categorisation
d380a61
@lache-melvin
Merge pull request #5343 from msupply-foundation/5330-category-tables
9822117 
5330 category tables
@lache-melvin
Merge branch 'develop' into v2.4.1
e5c47d3
@lache-melvin
remove item category tables from changelog
7201e6e
@lache-melvin
translate categories from item categories
06a3d49
@lache-melvin
item_category -> category
2bd2e01
@lache-melvin
add item category query repository
bb2cd2a
@lache-melvin
wip item category translation
bac3250
@lache-melvin
translate item categories during item translation
a574654
@lache-melvin
pull item category translation out into separate funciton
b2aa369
@lache-melvin
default parent ID to null on all category translations
9127cdc
@lache-melvin
remove changelog types
99c4369
@lache-melvin
fix table name
5397bc5
@lache-melvin
add test for item category join translation
3214418
@lache-melvin
re-integrate items
8e777a7
@lache-melvin
allow additional table names in translators
af76dc4
@lache-melvin
item category -> item_category_join
5ea7b5a
@jmbrunskill
Suggestion for table_names()
87d0449
@lache-melvin
add category to item translation pull deps
c56e4a4
@lache-melvin
add category id to item filter
dc2d9b9
@lache-melvin
Merge branch '5331-translate_time_categories-suggestion' into 5331-tr…
448cd92 
…anslate-item-categories
fergie-nz and others added 24 commits December 10, 2024 13:05
@fergie-nz
Add totalStockOnHand to item with stats query
0ba2567
@andreievg
Move log system error up to super
24a5213
@fergie-nz
Add extra checks for queries
59cc40e 
Add checks for isVisibleOrOnHand for item queries and hasPacksInStore for stockLine queries
Also checks for isActive
@fergie-nz
Add default name sorting
e6d23b7
@fergie-nz
Remove redundant graphql sort
400701e
@fergie-nz
Add better visibility explanations
0e71573
@fergie-nz
Remove redundant fields from argument schema stock detail
b493d8b
@fergie-nz
remove redundant arguments from arguments.json
2ae510f
@jmbrunskill
Merge pull request #5731 from msupply-foundation/5098-a-single-proces…
e72b7d0 
…sor-error-blocks-all-future-processor-events(Move-log-system-error-up-to-super)

Move log system error up to super
@jmbrunskill
Add new RemoteToCentral Sync Style
95de019
@roxy-dao
Merge pull request #5727 from msupply-foundation/5579-fix-item-usage-…
74724d5 
…queries

Fix queries on item usage report
@roxy-dao
Add is active filter to stock line
8c87143
@andreievg
Merge branch 'v2.4.1' into 5025-hidden-items-showing-on-item-usage-an…
965923d 
…d-stock-details-reports
@andreievg
New standard report json
24c58e8
@roxy-dao
Merge pull request #5730 from msupply-foundation/5025-hidden-items-sh…
0648a4d 
…owing-on-item-usage-and-stock-details-reports

5025 hidden items showing on item usage and stock details reports
@roxy-dao
Merge branch 'main' into v2.4.1
ba0c91f
@mark-prins
report changes
21076c5
@roxy-dao
Update report json
6249b13
@roxy-dao
Refactor to one report
6e18fc4
@roxy-dao
Merge pull request #5736 from msupply-foundation/5735-report-tweaks
dcca309 
Report tweaks
@roxy-dao
Bump
79a0cbb
@jmbrunskill
Merge pull request #5703 from msupply-foundation/5098-a-single-proces…
0440046 
…sor-error-blocks-all-future-processor-events

5098 a single processor error blocks all future processor events
@roxy-dao
Merge branch 'main' into v2.4.1
2e4265e
@roxy-dao
Bump
1a99da3
@github-actions GitHub Actions
Copy link

Bundle size difference

Comparing this PR to main

Old size New size Diff
5 MB 4.94 MB -57.53 KB (-1.12%)

roxy-dao
roxy-dao approved these changes Dec 12, 2024
View reviewed changes
Copy link
Contributor

@roxy-dao roxy-dao left a comment

Choose a reason for hiding this comment

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

Opps thanks Lache~

@roxy-dao roxy-dao self-assigned this Dec 12, 2024
@roxy-dao roxy-dao merged commit 903872f into main Dec 12, 2024
7 of 10 checks passed
@roxy-dao roxy-dao deleted the v2.4.1 branch December 12, 2024 21:27
@zachariah-at-msupply zachariah-at-msupply restored the v2.4.1 branch December 22, 2024 22:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@roxy-dao roxy-dao roxy-dao approved these changes

Assignees

@roxy-dao roxy-dao

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@lache-melvin @roxy-dao @jmbrunskill @CarlosNZ @fergie-nz @andreievg @mark-prins