-
-
Notifications
You must be signed in to change notification settings - Fork 857
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 portal partner merge #546
Closed
JayVora-SerpentCS
wants to merge
11
commits into
OCA:11.0
from
JayVora-SerpentCS:11.0-mig-portal_partner_merge
Closed
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
800cc89
extract portal dependancy from base_partner_merge
yvaucher d2dab83
Fix pep8
c57c4ea
Fix pep8 (line length)
bwrsandman a30101f
Add OCA as author of OCA addons
gurneyalex 97bc8e9
Add missing default oca icons
yvaucher ff49e20
OCA Transbot updated translations from Transifex
oca-transbot 81400b3
[UPD] prefix versions with 8.0
sbidoul 149bd0f
[MIG] Make modules uninstallable
pedrobaeza ad63187
[FIX] remove en.po that was erroneously created by transbot
sbidoul 08b604d
[MIG] Rename manifest files
pedrobaeza 2b4fabc
[MIG] Migrated portal_partner_merge to 11.0
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,15 @@ | ||
Author: Yannick Vaucher | ||
Copyright 2013 Camptocamp SA | ||
|
||
This program is free software: you can redistribute it and/or modify | ||
it under the terms of the GNU Affero General Public License as | ||
published by the Free Software Foundation, either version 3 of the | ||
License, or (at your option) any later version. | ||
|
||
This program is distributed in the hope that it will be useful, | ||
but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
GNU Affero General Public License for more details. | ||
|
||
You should have received a copy of the GNU Affero General Public License | ||
along with this program. If not, see <http://www.gnu.org/licenses/>. |
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,69 @@ | ||
.. 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 | ||
|
||
==================== | ||
Portal Partner Merge | ||
==================== | ||
|
||
This module extends the warning message which appears upon failing to assign users to the portal group. | ||
|
||
|
||
Installation | ||
============ | ||
|
||
To install this module, you need to have base_partner_merge module installed. | ||
|
||
|
||
Usage | ||
===== | ||
|
||
You can access the wizard by going in a list of contacts, selecting 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>`_. | ||
|
||
|
||
Contributors | ||
------------ | ||
|
||
* Serpent Consulting Services Pvt. Ltd. <jay.vora@serpentcs.com> | ||
|
||
|
||
Author | ||
------ | ||
|
||
* Yannick Vaucher <yannick.vaucher@camptocamp.com> | ||
|
||
|
||
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,2 @@ | ||
# See LICENSE file for full copyright and licensing details. | ||
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,15 @@ | ||
# See LICENSE file for full copyright and licensing details. | ||
{'name': 'Portal Partner Merge', | ||
'version': '11.0.1.0.0', | ||
'category': 'Hidden', | ||
'author': "Camptocamp,Odoo Community Association (OCA)", | ||
'maintainer': 'Camptocamp', | ||
'license': 'AGPL-3', | ||
'website': 'http://www.camptocamp.com/', | ||
'depends': ['portal', 'base_partner_merge'], | ||
'data': [], | ||
'test': [], | ||
'installable': True, | ||
'auto_install': False, | ||
'application': False, | ||
} |
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,33 @@ | ||
# Translation of Odoo Server. | ||
# This file contains the translation of the following modules: | ||
# * portal_partner_merge | ||
# | ||
# Translators: | ||
# danimaribeiro <danimaribeiro@gmail.com>, 2015 | ||
msgid "" | ||
msgstr "" | ||
"Project-Id-Version: partner-contact (8.0)\n" | ||
"Report-Msgid-Bugs-To: \n" | ||
"POT-Creation-Date: 2015-08-28 15:54+0000\n" | ||
"PO-Revision-Date: 2015-07-22 18:38+0000\n" | ||
"Last-Translator: danimaribeiro <danimaribeiro@gmail.com>\n" | ||
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-partner-contact-8-0/language/pt_BR/)\n" | ||
"MIME-Version: 1.0\n" | ||
"Content-Type: text/plain; charset=UTF-8\n" | ||
"Content-Transfer-Encoding: \n" | ||
"Language: pt_BR\n" | ||
"Plural-Forms: nplurals=2; plural=(n > 1);\n" | ||
|
||
#. module: portal_partner_merge | ||
#: code:addons/portal_partner_merge/wizard/portal_wizard.py:35 | ||
#, python-format | ||
msgid "" | ||
"- Merge existing contacts together using the Automatic Merge wizard, " | ||
"available in the More menu after selecting several contacts in the Customers" | ||
" list" | ||
msgstr "- Mescla contatos existentes usando o Wizard, disponível no menu após selecionar vários contatos na lista de clientes." | ||
|
||
#. module: portal_partner_merge | ||
#: model:ir.model,name:portal_partner_merge.model_portal_wizard_user | ||
msgid "Portal User Config" | ||
msgstr "Configurações portal do usuário" |
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,33 @@ | ||
# Translation of Odoo Server. | ||
# This file contains the translation of the following modules: | ||
# * portal_partner_merge | ||
# | ||
# Translators: | ||
# Matjaž Mozetič <m.mozetic@matmoz.si>, 2015 | ||
msgid "" | ||
msgstr "" | ||
"Project-Id-Version: partner-contact (8.0)\n" | ||
"Report-Msgid-Bugs-To: \n" | ||
"POT-Creation-Date: 2015-08-28 15:54+0000\n" | ||
"PO-Revision-Date: 2015-05-29 04:46+0000\n" | ||
"Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>\n" | ||
"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-partner-contact-8-0/language/sl/)\n" | ||
"MIME-Version: 1.0\n" | ||
"Content-Type: text/plain; charset=UTF-8\n" | ||
"Content-Transfer-Encoding: \n" | ||
"Language: sl\n" | ||
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" | ||
|
||
#. module: portal_partner_merge | ||
#: code:addons/portal_partner_merge/wizard/portal_wizard.py:35 | ||
#, python-format | ||
msgid "" | ||
"- Merge existing contacts together using the Automatic Merge wizard, " | ||
"available in the More menu after selecting several contacts in the Customers" | ||
" list" | ||
msgstr "- Spoji obstoječe stike z uporabo čarovnika za samodejno spajanje, ki je dosegljiv v meniju več po izbiri več stikov iz seznama stikov" | ||
|
||
#. module: portal_partner_merge | ||
#: model:ir.model,name:portal_partner_merge.model_portal_wizard_user | ||
msgid "Portal User Config" | ||
msgstr "Nastavitve uporabnika portala" |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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,2 @@ | ||
# See LICENSE file for full copyright and licensing details. | ||
from . import portal_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,18 @@ | ||
# See LICENSE file for full copyright and licensing details. | ||
|
||
from odoo import api, models, _ | ||
|
||
|
||
class PortalWizardUser(models.TransientModel): | ||
_inherit = 'portal.wizard.user' | ||
|
||
@api.multi | ||
def get_error_messages(self): | ||
error_msg = super(PortalWizardUser, self).get_error_messages() | ||
if error_msg: | ||
error_msg[-1] = '%s\n%s' % ( | ||
error_msg[-1], | ||
_("- Merge existing contacts together using the Automatic " | ||
"Merge wizard, available in the Action menu after selecting " | ||
"several contacts in the Customers list")) | ||
return error_msg |
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.
IMHO Please change URL as described in https://github.com/OCA/maintainer-tools/blob/master/template/module/__manifest__.py#L10