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

[13.0][MIG] delivery_carrier_partner #261

Merged
merged 14 commits into from
Aug 6, 2020
Merged

[13.0][MIG] delivery_carrier_partner #261

merged 14 commits into from
Aug 6, 2020

Conversation

acsonefho
Copy link
Contributor

Migration of the module delivery_carrier_partner.

SimoRubi and others added 13 commits April 22, 2020 14:55
@SimoRubi @acsonefho
[ADD] delivery_carrier: Add transporter field
a1cc548
@oca-travis @acsonefho
[UPD] Update delivery_carrier_partner.pot
5aa5077
@SimoRubi @acsonefho
[MIG] delivery_carrier_partner: Migration to 11.0
584b991
@oca-travis @acsonefho
[UPD] Update delivery_carrier_partner.pot
c9f7cf5
@sergio-teruel @acsonefho
[11.0][IMP] partner_delivery_zone: Display delivery zones for incomin…
3faebee 
…g pickings too.
@oca-transbot @acsonefho
Update translation files
18fc0c9 
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: delivery-carrier-11.0/delivery-carrier-11.0-delivery_carrier_partner
Translate-URL: https://translation.odoo-community.org/projects/delivery-carrier-11-0/delivery-carrier-11-0-delivery_carrier_partner/
@fanha99 @acsonefho
better carrier partner form
493082b
@OCA-git-bot @acsonefho
[ADD] icon.png
8fe25b6
@OCA-git-bot @acsonefho
[UPD] README.rst
9add2c3
@ValentinVinagre @acsonefho
[MIG] delivery_carrier_partner: Migration to 12.0
940c0bf
@OCA-git-bot @acsonefho
[UPD] README.rst
d6a14e8
@oca-travis @acsonefho
[UPD] Update delivery_carrier_partner.pot
bda7495
@oca-transbot @acsonefho
Update translation files
6a03ee8 
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: delivery-carrier-12.0/delivery-carrier-12.0-delivery_carrier_partner
Translate-URL: https://translation.odoo-community.org/projects/delivery-carrier-12-0/delivery-carrier-12-0-delivery_carrier_partner/
@acsonefho acsonefho force-pushed the 13.0-mig-delivery_carrier_partner branch 2 times, most recently from 04d86bb to 6de8cda Compare April 22, 2020 13:23
@acsonefho
Copy link
Contributor Author

@ThomasBinsfeld @rousseldenis Can you review please? :)

@rousseldenis rousseldenis added this to the 13.0 milestone Apr 22, 2020
@OCA-git-bot OCA-git-bot mentioned this pull request Apr 22, 2020
Closed
13 tasks
@rousseldenis
Copy link
Sponsor Contributor

@acsonefho Did you follow https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-13.0#howto to migrate ? Why removing .pot and translations? pre-commit changes should appear in a separate commit.

@acsonefho
Copy link
Contributor Author

@acsonefho Did you follow https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-13.0#howto to migrate ? Why removing .pot and translations? pre-commit changes should appear in a separate commit.

I follow the guideline and I accidentally removed translations files! (I'm going to restore them).
About pre-commit, there are only 3 changes (as this module is very small) so I did only 1 commit.

@acsonefho acsonefho force-pushed the 13.0-mig-delivery_carrier_partner branch from 6de8cda to 76c9a02 Compare April 22, 2020 14:01
@rousseldenis
Copy link
Sponsor Contributor

rousseldenis commented Apr 28, 2020 •
edited
Loading

@acsonefho Did you follow https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-13.0#howto to migrate ? Why removing .pot and translations? pre-commit changes should appear in a separate commit.

I follow the guideline and I accidentally removed translations files! (I'm going to restore them).
About pre-commit, there are only 3 changes (as this module is very small) so I did only 1 commit.

Ok. In guidelines, we'd prefer putting pre-commit changes in a separate commit before migration one in order to get real migration changes in the good commit. And it's easier to review. But don't worry, it's ok for this

rousseldenis
rousseldenis approved these changes Apr 28, 2020
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.

Code review

@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). 🤖

gaikaz
gaikaz approved these changes Aug 4, 2020
View reviewed changes
Copy link
Member

@gaikaz gaikaz left a comment

Choose a reason for hiding this comment

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

Code LGTM

@rousseldenis
Copy link
Sponsor Contributor

@acsonefho Ok, let's go here. For the next time, don't forget to follow OCA guidelines and put black modifications into a separated commit (before the migration one).

@rousseldenis
Copy link
Sponsor Contributor

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

On my way to merge this fine PR!
Prepared branch 13.0-ocabot-merge-pr-261-by-rousseldenis-bump-patch, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit bf8e5db into OCA:13.0 Aug 6, 2020
@OCA-git-bot
Copy link
Contributor

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

victoralmau pushed a commit to Tecnativa/delivery-carrier that referenced this pull request Aug 4, 2021
@OCA-git-bot
Merge PR OCA#261 into 13.0
e61c74c 
Signed-off-by rousseldenis
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ThomasBinsfeld ThomasBinsfeld ThomasBinsfeld approved these changes

@gaikaz gaikaz gaikaz approved these changes

@rousseldenis rousseldenis rousseldenis approved these changes

Assignees
No one assigned
Labels
approved merged 🎉 migration needs review ready to merge
Projects
None yet
Milestone
13.0
Development

Successfully merging this pull request may close these issues.

None yet