Skip to content

OBPIH-6692 handle negative invoiced amount numbers and invoiced amount not equal to total adjustment amount#4893

Merged
awalkowiak merged 1 commit intorelease/0.9.2-hotfix1from
feature/OBPIH-6692-show-adjustments-with-invoice-amount-not-fully-invoiced-on-outstanding-order-report
Oct 14, 2024
Merged

OBPIH-6692 handle negative invoiced amount numbers and invoiced amount not equal to total adjustment amount#4893
awalkowiak merged 1 commit intorelease/0.9.2-hotfix1from
feature/OBPIH-6692-show-adjustments-with-invoice-amount-not-fully-invoiced-on-outstanding-order-report

Conversation

@drodzewicz
Copy link
Collaborator

@drodzewicz drodzewicz commented Oct 11, 2024

✨ Description of Change

A concise summary of what is being changed. Please provide enough context for reviewers to be able to understand the change and why it is necessary. If the issue/ticket already provides enough information, you can put "See ticket" as the description.

Link to GitHub issue or Jira ticket: OBPIH-6692

Description:
There were two points needed fixing

  • remove fully invoiced adjustments with negative values from the report
  • report did not include adjustments where adjustment has been invoiced but amount was edited to smaller

📷 Screenshots & Recordings (optional)

If this PR contains a UI change, consider adding one or more screenshots here or link to a screen recording to help reviewers visualize the change. Otherwise, you can remove this section.

@drodzewicz drodzewicz self-assigned this Oct 11, 2024
@github-actions github-actions bot added type: feature A new piece of functionality for the app domain: backend Changes or discussions relating to the backend server labels Oct 11, 2024
OR invoice.invoice_type_id IS NULL
OR invoice.date_posted IS NULL
OR (invoice.date_posted IS NOT NULL AND adjustment_invoice_amount.total_invoiced_amount < order_adjustment_details.total_adjustment)
OR (invoice.date_posted IS NOT NULL AND ABS(adjustment_invoice_amount.total_invoiced_amount) != order_adjustment_details.total_adjustment)
Copy link
Collaborator

Choose a reason for hiding this comment

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

@drodzewicz Shouldn't this part order_adjustment_details.total_adjustment be abs as well?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

it is already ABS'ed in the order_adjustment_details view

@awalkowiak awalkowiak merged commit e975879 into release/0.9.2-hotfix1 Oct 14, 2024
@awalkowiak awalkowiak deleted the feature/OBPIH-6692-show-adjustments-with-invoice-amount-not-fully-invoiced-on-outstanding-order-report branch October 14, 2024 08:45
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

domain: backend Changes or discussions relating to the backend server type: feature A new piece of functionality for the app

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants