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] added case when resupply from another warehouse #229

Merged
merged 1 commit into from May 4, 2023
Merged

[14.0][FIX] added case when resupply from another warehouse #229

merged 1 commit into from May 4, 2023

Conversation

ChrisOForgeFlow
Copy link
Contributor

@OCA-git-bot
Copy link
Contributor

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

@ChrisOForgeFlow ChrisOForgeFlow force-pushed the fix-ddmrp_distributed_source_location branch from 872ba50 to 3939422 Compare June 30, 2022 19:36
@sorvis
Copy link

sorvis commented Jul 27, 2022

@ChrisOForgeFlow when I'm running gitagg it is getting a merge conflict on manifest.py and I see here github is saying there is a conflict. What is the normal process to resolve this should the conflict be fixed here so I can pull this in directly with gitagg?

@ChrisOForgeFlow ChrisOForgeFlow force-pushed the fix-ddmrp_distributed_source_location branch from d6b3b9d to f054247 Compare July 28, 2022 16:14
@ChrisOForgeFlow
Copy link
Contributor Author

@ChrisOForgeFlow when I'm running gitagg it is getting a merge conflict on manifest.py and I see here github is saying there is a conflict. What is the normal process to resolve this should the conflict be fixed here so I can pull this in directly with gitagg?

Rebase was done, please try again

@max3903 max3903 added this to the 14.0 milestone Nov 2, 2022
@github-actions
Copy link

github-actions bot commented Mar 5, 2023

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 Mar 5, 2023
LoisRForgeFlow
LoisRForgeFlow reviewed Apr 4, 2023
View reviewed changes
ddmrp/__manifest__.py Outdated Show resolved Hide resolved
ddmrp/migrations/14.0.1.13.2/post-fix_distributed_source_location.py Outdated Show resolved Hide resolved
ddmrp/models/stock_buffer.py Show resolved Hide resolved
@LoisRForgeFlow LoisRForgeFlow removed the stale PR/Issue without recent activity, it'll be soon closed automatically. label Apr 4, 2023
@ChrisOForgeFlow ChrisOForgeFlow force-pushed the fix-ddmrp_distributed_source_location branch from f054247 to 573165d Compare April 4, 2023 11:59
@ChrisOForgeFlow ChrisOForgeFlow force-pushed the fix-ddmrp_distributed_source_location branch 2 times, most recently from 60e400f to 15a5588 Compare April 27, 2023 15:14
@ChrisOForgeFlow ChrisOForgeFlow force-pushed the fix-ddmrp_distributed_source_location branch from 15a5588 to 7c1df7f Compare April 28, 2023 18:17
LoisRForgeFlow
LoisRForgeFlow approved these changes May 4, 2023
View reviewed changes
Copy link
Contributor

@LoisRForgeFlow LoisRForgeFlow left a comment

Choose a reason for hiding this comment

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

Thanks!

@LoisRForgeFlow
Copy link
Contributor

Merging without bumping version as it has been done manually.

/ocabot merge nobump

@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-229-by-LoisRForgeFlow-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 43b094c into OCA:14.0 May 4, 2023
5 of 7 checks passed
@OCA-git-bot
Copy link
Contributor

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

@LoisRForgeFlow LoisRForgeFlow deleted the fix-ddmrp_distributed_source_location branch May 4, 2023 09:11
@LoisRForgeFlow
Copy link
Contributor

@ChrisOForgeFlow Could you fwport this fix to v15?

@ChrisOForgeFlow ChrisOForgeFlow mentioned this pull request May 4, 2023
Merged
OriolMForgeFlow pushed a commit to ForgeFlow/ddmrp-1 that referenced this pull request Jun 15, 2023
@JordiBForgeFlow @JoanMForgeFlow
account_move_line_stock_info (OCA#229)
69269dc 
* [ADD] account_move_line_stock_info
@sebalix sebalix mentioned this pull request Jul 5, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LoisRForgeFlow LoisRForgeFlow LoisRForgeFlow 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.

None yet
5 participants
@ChrisOForgeFlow @OCA-git-bot @sorvis @LoisRForgeFlow @max3903