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.

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

[FIX][8.0][base_partner_merge] Merging two partners with same follower fails no more. Fixes #179 #182

Merged
merged 4 commits into from
Jan 7, 2016

Conversation

charbeljc
Copy link

No description provided.

@dreispt
Copy link
Sponsor Member

dreispt commented Oct 12, 2015

You should use a more meaningful commit message.
For example: Merging two partners with same follower failed. Fixes #179

@charbeljc charbeljc changed the title fixes OCA/partner-contact#179 Merging two partners with same follower failed. Fixes #179 Oct 12, 2015
@guewen
Copy link
Member

guewen commented Oct 14, 2015

👍

@charbeljc charbeljc changed the title Merging two partners with same follower failed. Fixes #179 [FIX][8.0][base_partner_merge] Merging two partners with same follower failed. Fixes #179 Oct 14, 2015
@charbeljc charbeljc changed the title [FIX][8.0][base_partner_merge] Merging two partners with same follower failed. Fixes #179 [FIX][8.0][base_partner_merge] Merging two partners with same follower fails. Fixes #179 Oct 14, 2015
@charbeljc
Copy link
Author

Hi @dreispt I restated this PR following your advice, but travis seams stale and I have no view on the build queue, could you help me on this ?

@charbeljc charbeljc changed the title [FIX][8.0][base_partner_merge] Merging two partners with same follower fails. Fixes #179 [FIX][8.0][base_partner_merge] Merging two partners with same follower fails no more. Fixes #179 Oct 14, 2015
Contributors
------------

* Firstname Lastname <email.address@example.org>
Copy link
Member

Choose a reason for hiding this comment

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

You could add yourself here

@damdam-s
Copy link
Member

some remarks else 👍

@rafaelbn
Copy link
Member

Tested in runbot 👍
Please review comment above, thanks.

@rafaelbn
Copy link
Member

Please check #196 as @guewen said

@charbeljc
Copy link
Author

Hum, I didn't notice the duplication of this module from crm. Thanks @rafaelbn & @guewen for pointing this. How should we handle this situation ? we currently have PR #182 and #183 for the duplicated OCA module, should I resubmit them on the base crm package ?

@@ -1 +1,2 @@
from . import base_partner_merge
# -*- coding: utf-8 -*-
from . import base_partner_merge # NOQA

Choose a reason for hiding this comment

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

NOQA?

@hbrunn
Copy link
Member

hbrunn commented Jan 7, 2016

👍

hbrunn added a commit that referenced this pull request Jan 7, 2016
[FIX][8.0][base_partner_merge] Merging two partners with same follower fails no more. Fixes #179
@hbrunn hbrunn merged commit 5b682f3 into OCA:8.0 Jan 7, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants