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

[14.0][FIX] stock_picking_show_return fix tests #891

Merged
merged 1 commit into from
Sep 17, 2021
Merged

[14.0][FIX] stock_picking_show_return fix tests #891

merged 1 commit into from
Sep 17, 2021

Conversation

dzungtran89
Copy link
Contributor

This is a known issue fixed in this PR #886

@dzungtran89 dzungtran89 mentioned this pull request Sep 16, 2021
Merged
@pedrobaeza pedrobaeza added this to the 14.0 milestone Sep 16, 2021
@pedrobaeza
Copy link
Member

Please cherry-pick the commit instead for not losing attribution.

@dzungtran89
Copy link
Contributor Author

thx @pedrobaeza , I'll update it

@dzungtran89 dzungtran89 force-pushed the 14.0-fix-test-stock_picking_show_return branch from d9fa4be to 3d40a60 Compare September 16, 2021 08:14
@pedrobaeza
Copy link
Member

pedrobaeza commented Sep 16, 2021 •
edited
Loading

Please squash both commits into one, as the second one wasn't needed if the conflict resolution on the first one was correct.

@dzungtran89 dzungtran89 force-pushed the 14.0-fix-test-stock_picking_show_return branch from 3d40a60 to 5b20a9b Compare September 16, 2021 08:20
simahawk
simahawk approved these changes Sep 17, 2021
View reviewed changes
Copy link
Contributor

@simahawk simahawk left a comment

Choose a reason for hiding this comment

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

LG. Fine for you @pedrobaeza ?

@pedrobaeza
Copy link
Member

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

What a great day to merge this nice PR. Let's do it!
Prepared branch 14.0-ocabot-merge-pr-891-by-pedrobaeza-bump-patch, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 014d56c into OCA:14.0 Sep 17, 2021
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at e887048. Thanks a lot for contributing to OCA. ❤️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@simahawk simahawk simahawk approved these changes

Assignees
No one assigned
Labels
merged 🎉
Projects
None yet
Milestone
14.0
Development

Successfully merging this pull request may close these issues.
5 participants
@dzungtran89 @pedrobaeza @OCA-git-bot @simahawk @sergio-teruel