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

[10.0] [ADD] sale_procurement_group_by_requested_date #668

Merged
merged 6 commits into from
Sep 5, 2019
Merged

[10.0] [ADD] sale_procurement_group_by_requested_date #668

merged 6 commits into from
Sep 5, 2019

Conversation

AaronHForgeFlow
Copy link
Contributor

Supersedes #541

@AaronHForgeFlow AaronHForgeFlow changed the title 10.0 sale procurement group by requested date [10.0] [ADD] sale_procurement_group_by_requested_date Jul 9, 2018
@AaronHForgeFlow AaronHForgeFlow mentioned this pull request Jul 9, 2018
Closed
@AaronHForgeFlow
Copy link
Contributor Author

Needs fixing

@AaronHForgeFlow AaronHForgeFlow force-pushed the 10.0-sale_procurement_group_by_requested_date branch 2 times, most recently from 3d5791e to 9cab86b Compare July 10, 2018 15:36
@AaronHForgeFlow
Copy link
Contributor Author

ping @mreficent

@MiquelRForgeFlow
Copy link
Contributor

If removing dependency, I think this needs a glue module.

@AaronHForgeFlow AaronHForgeFlow force-pushed the 10.0-sale_procurement_group_by_requested_date branch from 9cab86b to f46219b Compare August 2, 2018 08:41
@AaronHForgeFlow AaronHForgeFlow mentioned this pull request Aug 3, 2018
Closed
@AaronHForgeFlow
Copy link
Contributor Author

sale_sourced_by_line is deprecated as long as we can add routes to the sale order lines, IMO no glue module is needed.

@AaronHForgeFlow AaronHForgeFlow mentioned this pull request Nov 22, 2018
Closed
nikul-serpentcs
nikul-serpentcs reviewed Nov 23, 2018
View reviewed changes
Copy link
Member

@nikul-serpentcs nikul-serpentcs left a comment

Choose a reason for hiding this comment

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

Minor Change

sale_procurement_group_by_requested_date/__manifest__.py Outdated Show resolved Hide resolved
sale_procurement_group_by_requested_date/models/sale_order.py Outdated Show resolved Hide resolved
sale_procurement_group_by_requested_date/tests/test_sale_procurement_group_by_requested_date.py Outdated Show resolved Hide resolved
@AaronHForgeFlow AaronHForgeFlow force-pushed the 10.0-sale_procurement_group_by_requested_date branch 2 times, most recently from a821f99 to 113a486 Compare December 4, 2018 16:56
@AaronHForgeFlow
Copy link
Contributor Author

@nikul-serpentcs comments attended

MiquelRForgeFlow
MiquelRForgeFlow approved these changes Dec 4, 2018
View reviewed changes
Copy link
Contributor

@MiquelRForgeFlow MiquelRForgeFlow left a comment

Choose a reason for hiding this comment

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

LGTM

please squash

nikul-serpentcs
nikul-serpentcs approved these changes Dec 5, 2018
View reviewed changes
Copy link
Member

@nikul-serpentcs nikul-serpentcs left a comment

Choose a reason for hiding this comment

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

Code Review LGTM 👍

@AaronHForgeFlow
Copy link
Contributor Author

It seems the tests for sale_mrp_link are failing here. I will check if it is due this module

@MiquelRForgeFlow
Copy link
Contributor

Have you checked?

@AaronHForgeFlow
Copy link
Contributor Author

Have you checked?

Not yet

@AaronHForgeFlow AaronHForgeFlow force-pushed the 10.0-sale_procurement_group_by_requested_date branch from 113a486 to 2987191 Compare December 11, 2018 14:14
@AaronHForgeFlow
Copy link
Contributor Author

Could not reproduce on local. Rebasing.

@AaronHForgeFlow
Copy link
Contributor Author

Glue module is needed, will be proposed here.

@AaronHForgeFlow
Copy link
Contributor Author

AaronHForgeFlow commented Jan 21, 2019 •
edited
Loading

Of course the solution was to exclude this module to be installed together with sale_mrp_link. It happened the same to other modules that group procurements.
BTW it seems 10.0 branch is broken anyway. Edit: no, it is not. 😄

@tafaRU
Copy link
Member

tafaRU commented Jan 21, 2019

@aheficent, I think at the moment it's the only solution. See #717 (comment) as further info.

@AaronHForgeFlow
Copy link
Contributor Author

@tafaRU Thanks, yes I think that is the only solution.

@AaronHForgeFlow
Copy link
Contributor Author

Added glue module for sale_sourced_by_line and sale_procurement_group_by_requested_date. Sorry for the super large-ugly name.

@AaronHForgeFlow AaronHForgeFlow force-pushed the 10.0-sale_procurement_group_by_requested_date branch from 3917079 to 3d607c7 Compare January 22, 2019 09:05
@AaronHForgeFlow
Copy link
Contributor Author

It seems sale_delivery_split_date has higher priority key than the other modules that group procurements. As having all them installed together makes no sense, I exclude them to be installed together. Only sale_sourced_by_line and sale_procurement_group_by_requested_date is compatible using the glue module proposed here.

@AaronHForgeFlow
Copy link
Contributor Author

I seems there is a test failing on sale_triple_discount module. It is already happening in OCA/10.0 branch for this repo.

@AaronHForgeFlow AaronHForgeFlow force-pushed the 10.0-sale_procurement_group_by_requested_date branch 2 times, most recently from 1d3e093 to b2e78f2 Compare March 21, 2019 16:11
bjeficent
bjeficent approved these changes Mar 22, 2019
View reviewed changes
Copy link
Contributor

@bjeficent bjeficent left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@OCA-git-bot
Copy link
Contributor

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

@AaronHForgeFlow
Copy link
Contributor Author

This can be merged IMO

@LoisRForgeFlow LoisRForgeFlow mentioned this pull request Aug 12, 2019
Closed
@rafaelbn rafaelbn added this to the 10.0 milestone Aug 30, 2019
@rafaelbn
Copy link
Member

Please @aheficent This branch has conflicts that must be resolved

After this I will merge! Thanks

@MiquelRForgeFlow MiquelRForgeFlow force-pushed the 10.0-sale_procurement_group_by_requested_date branch from b2e78f2 to f7cf2c2 Compare September 2, 2019 11:03
@MiquelRForgeFlow
Copy link
Contributor

@rafaelbn ready to merge. The travis red part is unrelated to this PR, is related to sale_triple_discount that is being fixed in another PR.

@MiquelRForgeFlow MiquelRForgeFlow force-pushed the 10.0-sale_procurement_group_by_requested_date branch from f7cf2c2 to a54d6ae Compare September 2, 2019 18:42
@rafaelbn
Copy link
Member

rafaelbn commented Sep 5, 2019

/ocabot merge

@OCA-git-bot
Copy link
Contributor

On my way to merge this fine PR!
Prepared branch 10.0-ocabot-merge-pr-668-by-rafaelbn-bump-no, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Sep 5, 2019
@OCA-git-bot
Merge PR #668 into 10.0
ed28348 
Signed-off-by rafaelbn
@OCA-git-bot
Copy link
Contributor

It looks like something changed on 10.0 in the meantime.
Let me try again (no action is required from you).
Prepared branch 10.0-ocabot-merge-pr-668-by-rafaelbn-bump-no, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Sep 5, 2019
@OCA-git-bot
Merge PR #668 into 10.0
e0aae7a 
Signed-off-by rafaelbn
@OCA-git-bot OCA-git-bot merged commit a54d6ae into OCA:10.0 Sep 5, 2019
@OCA-git-bot
Copy link
Contributor

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

@MiquelRForgeFlow MiquelRForgeFlow deleted the 10.0-sale_procurement_group_by_requested_date branch September 5, 2019 12:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjeficent bjeficent bjeficent approved these changes

@MiquelRForgeFlow MiquelRForgeFlow MiquelRForgeFlow approved these changes

@nikul-serpentcs nikul-serpentcs nikul-serpentcs approved these changes

@rafaelbn rafaelbn rafaelbn approved these changes

Assignees
No one assigned
Labels
approved merged 🎉 ready to merge
Projects
None yet
Milestone
10.0
Development

Successfully merging this pull request may close these issues.
9 participants
@AaronHForgeFlow @MiquelRForgeFlow @tafaRU @OCA-git-bot @rafaelbn @nikul-serpentcs @bjeficent @serpentcs-dev1 @oca-transbot