OBPIH-6691 Add partially invoiced order summary status for order adjustments#4857
Merged
awalkowiak merged 3 commits intorelease/0.9.2-hotfix1from Sep 26, 2024
Merged
OBPIH-6691 Add partially invoiced order summary status for order adjustments#4857awalkowiak merged 3 commits intorelease/0.9.2-hotfix1from
awalkowiak merged 3 commits intorelease/0.9.2-hotfix1from
Conversation
alannadolny
requested review from
awalkowiak,
drodzewicz,
ewaterman and
kchelstowski
github-actions
bot
added
the
flag: schema change
awalkowiak
requested changes
Sep 25, 2024
| WHEN (SUM(items_and_adjustments_union.quantity_ordered) + SUM(items_and_adjustments_union.adjustments_count)) > 0 AND (SUM(items_and_adjustments_union.quantity_invoiced) + SUM(items_and_adjustments_union.adjustments_invoiced) > 0) THEN 'PARTIALLY_INVOICED' | ||
| WHEN SUM(items_and_adjustments_union.quantity_ordered) = 0 AND SUM(items_and_adjustments_union.invoiced_amount) = 0 THEN NULL | ||
| WHEN SUM(items_and_adjustments_union.quantity_ordered) = SUM(items_and_adjustments_union.quantity_invoiced) AND SUM(items_and_adjustments_union.total_adjustments) = SUM(items_and_adjustments_union.invoiced_amount) THEN 'INVOICED' | ||
| WHEN (SUM(items_and_adjustments_union.quantity_ordered) < SUM(items_and_adjustments_union.quantity_invoiced) AND SUM(items_and_adjustments_union.quantity_ordered) > 0) |
Collaborator
There was a problem hiding this comment.
I think this SUM(union.quantity_ordered) < SUM(union.quantity_invoiced should have the opposite sign. It's partially invoiced if only part of the ordered quantity is invoiced --> ordered > invoiced
plus this part: AND SUM(items_and_adjustments_union.quantity_ordered) > 0 should rather check if quantity_invoiced > 0
| WHEN SUM(items_and_adjustments_union.quantity_ordered) = 0 AND SUM(items_and_adjustments_union.invoiced_amount) = 0 THEN NULL | ||
| WHEN SUM(items_and_adjustments_union.quantity_ordered) = SUM(items_and_adjustments_union.quantity_invoiced) AND SUM(items_and_adjustments_union.total_adjustments) = SUM(items_and_adjustments_union.invoiced_amount) THEN 'INVOICED' | ||
| WHEN (SUM(items_and_adjustments_union.quantity_ordered) < SUM(items_and_adjustments_union.quantity_invoiced) AND SUM(items_and_adjustments_union.quantity_ordered) > 0) | ||
| OR (SUM(items_and_adjustments_union.invoiced_amount) < SUM(items_and_adjustments_union.total_adjustments) AND SUM(items_and_adjustments_union.total_adjustments) > 0) THEN 'PARTIALLY_INVOICED' |
Collaborator
There was a problem hiding this comment.
AND SUM(items_and_adjustments_union.total_adjustments) > 0 this should be as well invoiced_amount > 0
awalkowiak
requested changes
Sep 25, 2024
Collaborator
awalkowiak
left a comment
awalkowiak
left a comment
There was a problem hiding this comment.
Few key points from my local testing / local review:
- As mentioned in previous review, the
PARTIALLY_INVOICEDchecks are wrong and need to be improved. - If nothing is invoiced, then order status should not be
partially invoiced, but should properly reflect the current order state. - The invoiced amount calculation does not take into account if invoice is posted (here we only count only posted invoices).
- With the current solution there might be an ssue when we have an order adjutement with amount 0, that was invoiced for this amount (it should be treated as invoiced properly). Probably you could utilize the still available adjustment count and invoiced adjustment count on top of amount comparison for this case.
…tead of looking into the quantity invoiced
alannadolny
force-pushed
the
OBPIH-6691
branch
from
49b30df to
8c49c0c
Compare
awalkowiak
approved these changes
Sep 26, 2024
Collaborator
awalkowiak
left a comment
awalkowiak
left a comment
There was a problem hiding this comment.
There still might be one case that is not working, but I am merging it as is (disregarding the one problematic case, it looks good) since there is a lot to QA here.
jwalbers
pushed a commit
to jwalbers/openboxes
that referenced
this pull request
Oct 29, 2024
jwalbers
pushed a commit
to jwalbers/openboxes
that referenced
this pull request
Oct 31, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
✨ Description of Change
Link to GitHub issue or Jira ticket: https://pihemr.atlassian.net/browse/OBPIH-6691