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

[MIG]11.0 mig l10n nl partner name #209

Merged
merged 14 commits into from
Jan 28, 2019
Merged

[MIG]11.0 mig l10n nl partner name #209

merged 14 commits into from
Jan 28, 2019

Conversation

daramousk
Copy link
Member

No description provided.

@hbrunn hbrunn added this to the 11.0 milestone Nov 29, 2018
@daramousk daramousk changed the title [WIP]11.0 mig l10n nl partner name [MIG]11.0 mig l10n nl partner name Nov 29, 2018
@NL66278
Copy link
Contributor

NL66278 commented Nov 30, 2018

@daramousk Can you please rebase this branch to solve the merge conflicts?

@daramousk daramousk force-pushed the 11.0-mig-l10n_nl_partner_name branch 3 times, most recently from 6a69771 to 4c03059 Compare November 30, 2018 17:05
lfreeke
lfreeke reviewed Dec 2, 2018
View reviewed changes
Copy link
Contributor

@lfreeke lfreeke left a comment

Choose a reason for hiding this comment

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

👍 (functional test)

NL66278
NL66278 reviewed Dec 4, 2018
View reviewed changes
oca_dependencies.txt Outdated Show resolved Hide resolved
@astirpe
Copy link
Member

astirpe commented Dec 14, 2018

For the Travis failure, please have a look at #213 (comment)

@daramousk
Copy link
Member Author

@NL66278 Ok so I have removed the specific branch from oca_dependencies which will make stuff fail. Also, we need #213 (comment) as well as mentioned by Andrea to have these tests succeed.

@daramousk
Copy link
Member Author

You can remove the WIP tag. @hbrunn

@astirpe
Copy link
Member

astirpe commented Jan 17, 2019 •
edited

@daramousk those fixes mentioned in #213 (comment) were merged in 11.0. You can just rebase your branch.

hbrunn and others added 13 commits January 17, 2019 11:36
@hbrunn
[ADD] l10n_nl_partner_name, l10n_nl_partner_salutation
c367420
@hbrunn
[FIX] show empty string if lastname is unset
74a03fd
@hbrunn
[UPD] make it work with latest partner-contact
16a4f6b
@hbrunn
[FIX] flake8
2f85bb3
@hbrunn
[ADD] tests
0b1bc6f
@sbidoul
[UPD] prefix versions with 8.0
92f9642
@hbrunn
[FIX] linting
04811bf
[MIG] Migrates l10n_nl_partner_name
ce8a555 
from 8.0 to 10.0

[MIG] Migrates l10n_nl_partner_salutation from 8.0 to 10.0

Adding a commiter, changing the format of the licence comment, removing deprecated Char init variable

[FIX] Sort version of licencing, removing VIM comments, changing __openerp__ to __manifest__

[FIX] Adding tests to increase code coverage

[FIX] Replaces api.one with api.multi and inserting api.model

[FIX] Adds newlines on the xmls, adds licence on manifest, changes name of compute methods

[FIX] Creates the res_partner_title_sir in the module instead on the base module
@sbidoul
[FIX] version number in l10n_nl_partner_name
e99d0d6
@sbidoul
remove obsolete .pot files [ci skip]
6c40fd1
@oca-travis
[UPD] Update l10n_nl_partner_name.pot
9c3a36b
@hbrunn
[10.0] l10n_nl_partner_name improvements (OCA#128)
440af75 
* [DEL] obsolete manifest

* [IMP] allow to fill in names in a more natural way
@oca-travis
[UPD] Update l10n_nl_partner_name.pot
740774d
@daramousk daramousk force-pushed the 11.0-mig-l10n_nl_partner_name branch from ae621f9 to 3a9583c Compare January 17, 2019 10:37
@NL66278
Copy link
Contributor

NL66278 commented Jan 21, 2019

@daramousk Hi George, can you rebase the branch and see wether indeed it solves the travis and runbot errors?

@daramousk
Copy link
Member Author

@NL66278 This is already rebased from what I see.

@astirpe
Copy link
Member

astirpe commented Jan 21, 2019

Module base_view_inheritance_extension V11 was merged in OCA after the rebase was done, so I guess now a restart of Runbot and Travis will be enough.

@daramousk daramousk closed this Jan 21, 2019
@daramousk daramousk reopened this Jan 21, 2019
NL66278
NL66278 approved these changes Jan 21, 2019
View reviewed changes
Copy link
Contributor

@NL66278 NL66278 left a comment

Choose a reason for hiding this comment

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

👍 LGTM. Only restore license lines to init.py files. Not blocking.

@daramousk daramousk force-pushed the 11.0-mig-l10n_nl_partner_name branch from 3a9583c to ca822a9 Compare January 21, 2019 10:31
lfreeke
lfreeke approved these changes Jan 23, 2019
View reviewed changes
Copy link
Contributor

@lfreeke lfreeke left a comment

Choose a reason for hiding this comment

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

(test) 👍

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

@hbrunn hbrunn merged commit 6b405b5 into OCA:11.0 Jan 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NL66278 NL66278 NL66278 approved these changes

@lfreeke lfreeke lfreeke approved these changes

Assignees
No one assigned
Labels
approved needs review ready to merge
Projects
None yet
Milestone
11.0
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@daramousk @NL66278 @astirpe @OCA-git-bot @lfreeke @hbrunn @sbidoul @oca-travis