-
-
Notifications
You must be signed in to change notification settings - Fork 862
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
11.0 mig base partner merge #545
Closed
JayVora-SerpentCS
wants to merge
33
commits into
OCA:11.0
from
JayVora-SerpentCS:11.0-mig-base_partner_merge
+17,670
−0
Closed
Changes from 25 commits
Commits
Show all changes
33 commits
Select commit
Hold shift + click to select a range
db8412f
[ADD] base partner merge, to allow to merge partner and all related i…
vrenaville fda1ee1
[IMP] PEP8
yvaucher 074f67e
[FIX] remove display_name from base_partner_merge as included in acco…
yvaucher cb89883
extract portal dependancy from base_partner_merge
yvaucher e11db6c
Fix pep8
9fa142b
[FIX] The transient model base.partner.merge.line and base.partner.me…
eLBati 91e05ca
[FIX] base_partner_merge PEP8
eLBati ffc0992
Fix pep8 (line length)
bwrsandman fcdcc57
Fix mutable default
nbessi cb63e83
Fix pylint errors
tafaRU a7b0a91
Add OCA as author of OCA addons
gurneyalex fe3b3bf
[FIX] flake8
pedrobaeza 2859508
[FIX] base_partner_merge: don't overwrite magic columns
pedrobaeza 6edece6
Add missing default oca icons
yvaucher ac0024f
OCA Transbot updated translations from Transifex
oca-transbot bf32307
[UPD] prefix versions with 8.0
sbidoul 0687675
add missing dependency on mail base addon
e2aa639
[MIG] Make modules uninstallable
pedrobaeza ac30f8a
[9.0][PORT] base_partner_merge (#274)
yvaucher 7cb272c
[FIX] base_partner_merge: Avoid F405
pedrobaeza 5a69b8f
[FIX] remove en.po that was erroneously created by transbot
sbidoul fc9dbd9
[MIG] Make modules uninstallable
pedrobaeza d47ab8e
[MIG] Rename manifest files
pedrobaeza bec49bc
[FIX] Migrate base_partner_merge to V10
alan196 a31d8b6
[MIG] base_partner_merge : Migration to 11.0
JayVora-SerpentCS 3363045
Update README.rst
JayVora-SerpentCS a448032
Update __init__.py
JayVora-SerpentCS bf24b13
Update __manifest__.py
JayVora-SerpentCS baa7e7d
Update __init__.py
JayVora-SerpentCS 2597ab8
Update base_partner_merge.py
JayVora-SerpentCS e7c0404
Update base_partner_merge.xml
JayVora-SerpentCS b84ae28
Update base_partner_merge.py
JayVora-SerpentCS b60a436
Update base_partner_merge.xml
JayVora-SerpentCS File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg | ||
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html | ||
:alt: License: AGPL-3 | ||
|
||
============================ | ||
Deduplicate contact (No CRM) | ||
============================ | ||
|
||
This module installs the deduplicate wizard from CRM without the dependency on CRM. | ||
|
||
If you have CRM installed you don't need this module. | ||
|
||
|
||
Installation | ||
============ | ||
|
||
To install this module, you need to have crm module present (but not installed). | ||
This is because we reuse the existing wizard without installing CRM. | ||
|
||
|
||
Usage | ||
===== | ||
|
||
You can access the wizard by going in a view list of contacts select one or multiple | ||
|
||
.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas | ||
:alt: Try me on Runbot | ||
:target: https://runbot.odoo-community.org/runbot/134/11.0 | ||
|
||
Bug Tracker | ||
=========== | ||
|
||
Bugs are tracked on `GitHub Issues | ||
<https://github.com/OCA/partner-contact/issues>`_. In case of trouble, please | ||
check there if your issue has already been reported. If you spotted it first, | ||
help us smashing it by providing a detailed and welcomed feedback. | ||
|
||
Credits | ||
======= | ||
|
||
Images | ||
------ | ||
|
||
* Odoo Community Association: `Icon <https://github.com/OCA/maintainer-tools/blob/master/template/module/static/description/icon.svg>`_. | ||
|
||
Author | ||
------ | ||
|
||
Yannick Vaucher | ||
Based Holger Brunn's idea. | ||
|
||
Maintainer | ||
---------- | ||
|
||
.. image:: https://odoo-community.org/logo.png | ||
:alt: Odoo Community Association | ||
:target: https://odoo-community.org | ||
|
||
This module is maintained by the OCA. | ||
|
||
OCA, or the Odoo Community Association, is a nonprofit organization whose | ||
mission is to support the collaborative development of Odoo features and | ||
promote its widespread use. | ||
|
||
To contribute to this module, please visit https://odoo-community.org. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
# -*- coding: utf-8 -*- | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. remove coding headers |
||
# Copyright 2016 Camptocamp SA | ||
# Copyright 2017 Jarsa Sistemas | ||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). | ||
from . import wizard |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
# -*- coding: utf-8 -*- | ||
# Copyright 2016 Camptocamp SA | ||
# Copyright 2017 Jarsa Sistemas | ||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). | ||
{ | ||
'name': "Deduplicate Contacts (No CRM)", | ||
'version': '11.0.1.0.0', | ||
'summary': "Partner merge wizard without dependency on CRM", | ||
'category': 'Generic Modules/Base', | ||
'author': "Camptocamp,Odoo Community Association (OCA)", | ||
'license': 'AGPL-3', | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. add |
||
'depends': [ | ||
'base', | ||
'mail' | ||
], | ||
'data': [ | ||
'views/base_partner_merge.xml', | ||
], | ||
'installable': True, | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,295 @@ | ||
# Translation of Odoo Server. | ||
# This file contains the translation of the following modules: | ||
# * base_partner_merge | ||
# | ||
# Translators: | ||
# OCA Transbot <transbot@odoo-community.org>, 2016 | ||
msgid "" | ||
msgstr "" | ||
"Project-Id-Version: Odoo Server 9.0c\n" | ||
"Report-Msgid-Bugs-To: \n" | ||
"POT-Creation-Date: 2016-08-20 23:45+0000\n" | ||
"PO-Revision-Date: 2016-08-20 23:45+0000\n" | ||
"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n" | ||
"Language-Team: Amharic (https://www.transifex.com/oca/teams/23907/am/)\n" | ||
"MIME-Version: 1.0\n" | ||
"Content-Type: text/plain; charset=UTF-8\n" | ||
"Content-Transfer-Encoding: \n" | ||
"Language: am\n" | ||
"Plural-Forms: nplurals=2; plural=(n > 1);\n" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_exclude_contact | ||
msgid "A user associated to the contact" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form | ||
msgid "Are you sure to execute the automatic merge of your contacts ?" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form | ||
msgid "" | ||
"Are you sure to execute the list of automatic merges of your contacts ?" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form | ||
msgid "Automatic Merge Wizard" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form | ||
msgid "Cancel" | ||
msgstr "Cancelar" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form | ||
msgid "Close" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_partner_ids | ||
msgid "Contacts" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_create_uid | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_line_create_uid | ||
msgid "Created by" | ||
msgstr "Creado por" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_create_date | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_line_create_date | ||
msgid "Created on" | ||
msgstr "Creado en" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_current_line_id | ||
msgid "Current Line" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.actions.act_window,name:base_partner_merge.action_partner_deduplicate | ||
msgid "Deduplicate Contacts" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form | ||
msgid "Deduplicate the other Contacts" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_dst_partner_id | ||
msgid "Destination Contact" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_display_name | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_line_display_name | ||
msgid "Display Name" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_group_by_email | ||
msgid "Email" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form | ||
msgid "Exclude contacts having" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: selection:base.partner.merge.automatic.wizard,state:0 | ||
msgid "Finished" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_number_group | ||
msgid "Group of Contacts" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_id | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_line_id | ||
msgid "ID" | ||
msgstr "ID" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_line_aggr_ids | ||
msgid "Ids" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_group_by_is_company | ||
msgid "Is Company" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_exclude_journal_item | ||
msgid "Journal Items associated to the contact" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard___last_update | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_line___last_update | ||
msgid "Last Modified on" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_write_uid | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_line_write_uid | ||
msgid "Last Updated by" | ||
msgstr "Última actualización por" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_write_date | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_line_write_date | ||
msgid "Last Updated on" | ||
msgstr "Última actualización en" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_line_ids | ||
msgid "Lines" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_maximum_group | ||
msgid "Maximum of Group of Contacts" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form | ||
msgid "Merge Automatically" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form | ||
msgid "Merge Automatically all process" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form | ||
msgid "Merge Contacts" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.actions.act_window,name:base_partner_merge.action_partner_merge | ||
msgid "Merge Selected Contacts" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form | ||
msgid "Merge the following contacts" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form | ||
msgid "Merge with Manual Check" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_line_min_id | ||
msgid "MinID" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_group_by_name | ||
msgid "Name" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: selection:base.partner.merge.automatic.wizard,state:0 | ||
msgid "Option" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form | ||
msgid "Options" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_group_by_parent_id | ||
msgid "Parent Company" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.model,name:base_partner_merge.model_res_partner | ||
msgid "Partner" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form | ||
msgid "Partners" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form | ||
msgid "Search duplicates based on duplicated data in" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form | ||
msgid "" | ||
"Select the list of fields used to search for\n" | ||
" duplicated records. If you select several fields,\n" | ||
" Odoo will propose you to merge only those having\n" | ||
" all these fields in common. (not one of the fields)." | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form | ||
msgid "" | ||
"Selected contacts will be merged together.\n" | ||
" All documents linked to one of these contacts\n" | ||
" will be redirected to the destination contact.\n" | ||
" You can remove contacts from this list to avoid merging them." | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: selection:base.partner.merge.automatic.wizard,state:0 | ||
msgid "Selection" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form | ||
msgid "Skip these contacts" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_state | ||
msgid "State" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form | ||
msgid "There is no more contacts to merge for this request..." | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_group_by_vat | ||
msgid "VAT" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_line_wizard_id | ||
msgid "Wizard" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.model,name:base_partner_merge.model_base_partner_merge_automatic_wizard | ||
msgid "base.partner.merge.automatic.wizard" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.model,name:base_partner_merge.model_base_partner_merge_line | ||
msgid "base.partner.merge.line" | ||
msgstr "" | ||
|
||
#. module: base_partner_merge | ||
#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form | ||
msgid "or" | ||
msgstr "" |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
add email
<yannick.vaucher@camptocamp.com>
and "Do not contact contributors directly about support or help with technical issues." see https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst