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][MIG] shopfloor_dangerous_goods #334

Merged
merged 7 commits into from
Feb 24, 2023
Merged

[14.0][MIG] shopfloor_dangerous_goods #334

merged 7 commits into from
Feb 24, 2023

Conversation

mmequignon
Copy link
Member

@mmequignon mmequignon commented Dec 2, 2021 •
edited by sebalix
Loading

@mmequignon mmequignon changed the title [WIP] 14.0 mig shopflow dangerous goods [WIP] 14.0 mig shopfloor dangerous goods Dec 2, 2021
@mmequignon mmequignon force-pushed the 14.0-mig-shopflow_dangerous_goods branch from a08221e to 00c8811 Compare December 3, 2021 14:41
@sebalix sebalix changed the title [WIP] 14.0 mig shopfloor dangerous goods [WIP][14.0][MIG] shopfloor_dangerous_goods Dec 7, 2021
@sebalix sebalix added this to the 14.0 milestone Dec 7, 2021
sebalix
sebalix reviewed Dec 8, 2021
View reviewed changes
test-requirements.txt Outdated Show resolved Hide resolved
@mmequignon mmequignon force-pushed the 14.0-mig-shopflow_dangerous_goods branch from 00c8811 to 5e8e96d Compare December 8, 2021 10:09
@github-actions
Copy link

There hasn't been any activity on this pull request in the past 4 months, so it has been marked as stale and it will be closed automatically if no further activity occurs in the next 30 days.
If you want this PR to never become stale, please ask a PSC member to apply the "no stale" label.

@github-actions github-actions bot added the stale PR/Issue without recent activity, it'll be soon closed automatically. label Apr 10, 2022
@github-actions github-actions bot closed this May 15, 2022
@simahawk simahawk added no stale Use this label to prevent the automated stale action from closing this PR/Issue. and removed stale PR/Issue without recent activity, it'll be soon closed automatically. labels May 20, 2022
@simahawk simahawk reopened this May 20, 2022
@OCA-git-bot
Copy link
Contributor

Hi @simahawk,
some modules you are maintaining are being modified, check this out!

@simahawk simahawk mentioned this pull request Jul 28, 2022
Merged
@simahawk
Copy link
Contributor

I'm removing the test dep here to avoid conflicts w/ other PRs.
@mmequignon pls get back to this ASAP 🙏

@simahawk simahawk force-pushed the 14.0-mig-shopflow_dangerous_goods branch from 5e8e96d to 60dd485 Compare January 30, 2023 16:38
@mmequignon mmequignon force-pushed the 14.0-mig-shopflow_dangerous_goods branch from 60dd485 to 91e82ca Compare February 20, 2023 12:24
@mmequignon mmequignon marked this pull request as ready for review February 20, 2023 12:25
@mmequignon mmequignon force-pushed the 14.0-mig-shopflow_dangerous_goods branch from 30f0dfd to 117e00b Compare February 20, 2023 12:39
@simahawk simahawk changed the title [WIP][14.0][MIG] shopfloor_dangerous_goods [14.0][MIG] shopfloor_dangerous_goods Feb 21, 2023
@simahawk simahawk mentioned this pull request Feb 23, 2023
Merged
@simahawk simahawk force-pushed the 14.0-mig-shopflow_dangerous_goods branch from 117e00b to 64933f3 Compare February 24, 2023 07:55
simahawk
simahawk requested changes Feb 24, 2023
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.

blocking for me

shopfloor_dangerous_goods_mobile/static/wms/src/css/dangerous_goods.css
@@ -0,0 +1,10 @@
.detail-picking-select .has-lq-products .v-list-item__title::after {
Copy link
Contributor

Choose a reason for hiding this comment

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

Note to myself: this selector is compliant w/ a change that I still have to push in another PR

Copy link
Contributor

Choose a reason for hiding this comment

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

Here's the change #582

Copy link
Contributor

Choose a reason for hiding this comment

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

merged, rebased, we are good to go

@simahawk simahawk self-assigned this Feb 24, 2023
@simahawk simahawk force-pushed the 14.0-mig-shopflow_dangerous_goods branch 2 times, most recently from 7d7109c to e7dd54b Compare February 24, 2023 13:14
@simahawk simahawk force-pushed the 14.0-mig-shopflow_dangerous_goods branch from e7dd54b to 4b9c63c Compare February 24, 2023 13:16
simahawk
simahawk approved these changes Feb 24, 2023
View reviewed changes
shopfloor_dangerous_goods_mobile/static/wms/src/css/dangerous_goods.css
@@ -0,0 +1,10 @@
.detail-picking-select .has-lq-products .v-list-item__title::after {
Copy link
Contributor

Choose a reason for hiding this comment

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

merged, rebased, we are good to go

@simahawk
Copy link
Contributor

@mmequignon a great day for humanity.... 😜

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 14.0-ocabot-merge-pr-334-by-simahawk-bump-nobump, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Feb 24, 2023
@OCA-git-bot
Merge PR #334 into 14.0
4e42ce7 
Signed-off-by simahawk
@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). 🤖

@OCA-git-bot
Copy link
Contributor

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

@simahawk simahawk mentioned this pull request Feb 24, 2023
Closed
@OCA-git-bot OCA-git-bot merged commit 391ae65 into OCA:14.0 Feb 24, 2023
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at c0c7c48. 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

@sebalix sebalix sebalix approved these changes

@simahawk simahawk simahawk approved these changes

Assignees

@simahawk simahawk

Labels
approved merged 🎉 migration no stale Use this label to prevent the automated stale action from closing this PR/Issue. ready to merge
Projects
None yet
Milestone
14.0
Development

Successfully merging this pull request may close these issues.
4 participants
@mmequignon @OCA-git-bot @simahawk @sebalix