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

[12.0][MIG] stock_request_kanban #634

Merged
merged 16 commits into from Jul 11, 2019
Merged

[12.0][MIG] stock_request_kanban #634

merged 16 commits into from Jul 11, 2019

Conversation

kittiu
Copy link
Member

@kittiu kittiu commented Jun 27, 2019

Done migrated

@kittiu kittiu mentioned this pull request Jun 27, 2019
Closed
54 tasks
etobella
etobella approved these changes Jun 27, 2019
View reviewed changes
Copy link
Member

@etobella etobella left a comment

Choose a reason for hiding this comment

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

squash translation commits please 😄

@kittiu
Copy link
Member Author

kittiu commented Jun 27, 2019

squash translation commits please

Yes, I see lots of pot commit here. Question is, do squash only what is before the meaningful one, i..e, 801bea4 or find all in the history and quash all .pot (now sure you understand my question, sorry)

1329fcd6 (HEAD -> 12.0-mig-stock_request_kanban, origin/12.0-mig-stock_request_kanban) [12.0][MIG] stock_request_kanban
3487d283 Update translation files
2b4ed27a [UPD] Update stock_request_kanban.pot
d9b5f56a Update translation files
17419cb9 [UPD] Update stock_request_kanban.pot
8587373b [UPD] README.rst
801bea44 fixup! [IMP] Stock_request_kanban: Set barcode configuration on parameters
49bdf007 [IMP] Stock_request_kanban: Set barcode configuration on parameters
2fbf0231 Update translation files
f5e3f26f [UPD] Update stock_request_kanban.pot
9eb7b333 Update translation files
180eaca5 [UPD] Update stock_request_kanban.pot
744d3f84 Update translation files
1a3f97b3 [UPD] Update stock_request_kanban.pot
ce06051e Update translation files

@rousseldenis rousseldenis added this to the 12.0 milestone Jul 3, 2019
rousseldenis
rousseldenis approved these changes Jul 3, 2019
View reviewed changes
Copy link
Sponsor Contributor

@rousseldenis rousseldenis left a comment

Choose a reason for hiding this comment

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

LGTM

@LoisRForgeFlow
Copy link
Contributor

@kittiu I think you can squash all automatics commits that contain .pot files, as long as you keep the non-automatic ones (done by developers) it is fine and we keep history less noisy.

etobella and others added 16 commits July 11, 2019 15:12
@etobella @LoisRForgeFlow
[ADD] stock_request_kanban
8afb09c
@JordiBForgeFlow @LoisRForgeFlow
various fixes
60aa7d2
@oca-travis @LoisRForgeFlow
[UPD] Update stock_request_kanban.pot
c5c310b
@etobella @LoisRForgeFlow
Added translation using Weblate (Spanish)
c75dbcc
@etobella @LoisRForgeFlow
Translated using Weblate (Spanish)
d61f488 
Currently translated at 100,0% (40 of 40 strings)

Translation: stock-logistics-warehouse-11.0/stock-logistics-warehouse-11.0-stock_request_kanban
Translate-URL: https://translation.odoo-community.org/projects/stock-logistics-warehouse-11-0/stock-logistics-warehouse-11-0-stock_request_kanban/es/
@oca-travis @LoisRForgeFlow
[UPD] Update stock_request_kanban.pot
5f64a34
@etobella @LoisRForgeFlow
[IMP] Kanban: Add Inventory managament
ec3872f
@JordiBForgeFlow @LoisRForgeFlow
Fixes
ba81efa
@oca-travis @LoisRForgeFlow
[UPD] Update stock_request_kanban.pot
e4ab0a0
@JordiBForgeFlow @LoisRForgeFlow
[stock_request_kanban][FIX] _get_inventory_kanban_domain
feace73
@oca-travis @LoisRForgeFlow
[UPD] Update stock_request_kanban.pot
f274bc1
@AdriaGForgeFlow @LoisRForgeFlow
[11.0][FIX] Fix for stock_request_kanban
e2db7ed 
fixup!
@oca-transbot @LoisRForgeFlow
Update translation files
39de862 
Updated by Update PO files to match POT (msgmerge) hook in Weblate.
@etobella @LoisRForgeFlow
[IMP] Stock_request_kanban: Set barcode configuration on parameters
d5ccad1
@oca-travis @LoisRForgeFlow
[UPD] Update stock_request_kanban.pot
79dc384
@kittiu @LoisRForgeFlow
[12.0][MIG] stock_request_kanban
93d78de
LoisRForgeFlow
LoisRForgeFlow approved these changes Jul 11, 2019
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.

Code review LG. I just did a rebase in order to go ahead with the merge.

@LoisRForgeFlow
Copy link
Contributor

/ocabot merge

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Rebased to 12.0-ocabot-merge-pr-634-by-lreficent-bump-no, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 93d78de into OCA:12.0 Jul 11, 2019
@OCA-git-bot
Copy link
Contributor

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

PS: Don't worry if GitHub says there are unmerged commits: it is due to a rebase before merge. All commits of this PR have been merged into 12.0.

OCA-git-bot added a commit that referenced this pull request Jul 11, 2019
@OCA-git-bot
Merge PR #634 into 12.0
b3cf7d3 
Signed-off-by lreficent
@MiquelRForgeFlow
Copy link
Contributor

Bitches! You did a merge with a red runbot! Solved in #659.

shame

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

@rousseldenis rousseldenis rousseldenis approved these changes

@LoisRForgeFlow LoisRForgeFlow LoisRForgeFlow approved these changes

@etobella etobella etobella approved these changes

@jarroyomorales jarroyomorales jarroyomorales approved these changes

Assignees
No one assigned
Labels
approved merged 🎉 needs review
Projects
None yet
Milestone
12.0
Development

Successfully merging this pull request may close these issues.

None yet