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.

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

[Backport] Invoice grid shows wrong shipping & handling for partial items invoice. It shows order's shipping & handling instead if invoiced shipping& handling charge #16352

Conversation

gelanivishal
Copy link
Contributor

@gelanivishal gelanivishal commented Jun 23, 2018

Original Pull Request

#14795

Description

Preconditions

  1. Magento Version : (2.1.6 | 2.2.0 | 2.2.2 | 2.2.3) (community-edition), (2.2.2 | 2.2.3) (enterprise-edition)
  2. PHP : 7.0.24
  3. MySQL : 5.7.21
  4. Platform : MacOS High Sierra v10.13.4

Fixed Issues

  1. Invoice grid shows wrong shipping & handling for partial items invoice. It shows order's shipping & handling instead if invoiced shipping& handling charge

Manual testing scenarios

  1. Place order with multiple taxable items and shipping charge
  2. Generate separate invoice for each items and shipping charge should be covered in first invoice. (In short generate multiple invoices for same order with different items)
  3. Do check value of Shipping & Handling column value in Invoice grid.

Contribution checklist

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds on Travis CI are green)

Copy link
Contributor

@orlangur orlangur left a comment

Choose a reason for hiding this comment

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

Resolved conflicts is not really meaningful commit message, especially if this is the only one commit in PR :) (I understand it was produced as a result of cherry-pick or merge with squash)

Please amend commit with some text like in https://github.com/magento/magento2/commits?author=ankurseepossible and do force push. Easiest way is to cherry=pick 23f9209 and 1d988f8 separately.

@gelanivishal gelanivishal force-pushed the 2.1-develop-PR-port-15-14795 branch from 10e814b to 346eed2 Compare June 24, 2018 02:46
@gelanivishal
Copy link
Contributor Author

@orlangur I have updated commit message. Please check it 346eed2

Copy link
Contributor

@orlangur orlangur left a comment

Choose a reason for hiding this comment

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

@gelanivishal great job on rewriting branch history, thanks!

@magento-engcom-team
Copy link
Contributor

Hi @orlangur, thank you for the review.
ENGCOM-2136 has been created to process this Pull Request

@magento-engcom-team magento-engcom-team merged commit 346eed2 into magento:2.1-develop Jun 29, 2018
magento-engcom-team pushed a commit that referenced this pull request Jun 29, 2018
…for partial items invoice. It shows order's shipping & handling instead if invoiced shipping& handling charge #16352
@magento-engcom-team
Copy link
Contributor

Hi @gelanivishal. Thank you for your contribution.
The changes from your Pull Request should be available with the upcoming 2.1.15 release.
Please check the release notes for final confirmation.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants