From 800cc89349b51baf629082fa722ff127acacaef6 Mon Sep 17 00:00:00 2001 From: Yannick Vaucher Date: Wed, 2 Apr 2014 15:46:34 +0200 Subject: [PATCH 01/11] extract portal dependancy from base_partner_merge --- portal_partner_merge/__init__.py | 21 +++++++++++ portal_partner_merge/__openerp__.py | 36 ++++++++++++++++++ portal_partner_merge/wizard/__init__.py | 26 +++++++++++++ portal_partner_merge/wizard/portal_wizard.py | 39 ++++++++++++++++++++ 4 files changed, 122 insertions(+) create mode 100644 portal_partner_merge/__init__.py create mode 100644 portal_partner_merge/__openerp__.py create mode 100644 portal_partner_merge/wizard/__init__.py create mode 100644 portal_partner_merge/wizard/portal_wizard.py diff --git a/portal_partner_merge/__init__.py b/portal_partner_merge/__init__.py new file mode 100644 index 00000000000..ba6a8ecaf01 --- /dev/null +++ b/portal_partner_merge/__init__.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# 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 . +# +############################################################################## +from . import wizard diff --git a/portal_partner_merge/__openerp__.py b/portal_partner_merge/__openerp__.py new file mode 100644 index 00000000000..dad38863afe --- /dev/null +++ b/portal_partner_merge/__openerp__.py @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# 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 . +# +############################################################################## +{'name' : 'Portal Partner Merge', + 'version' : '1.0', + 'category': 'Hidden', + 'description': """ +Link module for base_partner_merge which extract portal dependency + """, + 'author' : 'Camptocamp', + 'maintainer': 'Camptocamp', + 'website': 'http://www.camptocamp.com/', + 'depends' : ['portal', 'base_partner_merge'], + 'data': [], + 'test': [], + 'installable': True, + 'auto_install': True, + 'application': False, + } diff --git a/portal_partner_merge/wizard/__init__.py b/portal_partner_merge/wizard/__init__.py new file mode 100644 index 00000000000..4345b14d9a4 --- /dev/null +++ b/portal_partner_merge/wizard/__init__.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Business Applications +# Copyright (c) 2013 OpenERP S.A. +# +# 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 . +# +############################################################################## + + +from . import portal_wizard + + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/portal_partner_merge/wizard/portal_wizard.py b/portal_partner_merge/wizard/portal_wizard.py new file mode 100644 index 00000000000..fceb42e4f0c --- /dev/null +++ b/portal_partner_merge/wizard/portal_wizard.py @@ -0,0 +1,39 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Business Applications +# Copyright (c) 2013 OpenERP S.A. +# +# 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 . +# +############################################################################## + +from openerp.osv import osv +from openerp.tools.translate import _ + +class wizard_user(osv.TransientModel): + _inherit = 'portal.wizard.user' + + def get_error_messages(self, cr, uid, ids, context=None): + error_msg = super(wizard_user, self + ).get_error_messages(cr, uid, ids, context=context) + if error_msg: + error_msg[-1] = '%s\n%s' % ( + error_msg[-1], + _("- Merge existing contacts together using the Automatic " + "Merge wizard, available in the More menu after selecting " + "several contacts in the Customers list")) + return error_msg + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From d2dab83413a84cbee50bb0ec9b6cad465ad40d29 Mon Sep 17 00:00:00 2001 From: Sandy Carter Date: Fri, 18 Jul 2014 19:22:54 -0400 Subject: [PATCH 02/11] Fix pep8 --- portal_partner_merge/__openerp__.py | 8 ++++---- portal_partner_merge/wizard/portal_wizard.py | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/portal_partner_merge/__openerp__.py b/portal_partner_merge/__openerp__.py index dad38863afe..b9848690fd6 100644 --- a/portal_partner_merge/__openerp__.py +++ b/portal_partner_merge/__openerp__.py @@ -18,16 +18,16 @@ # along with this program. If not, see . # ############################################################################## -{'name' : 'Portal Partner Merge', - 'version' : '1.0', +{'name': 'Portal Partner Merge', + 'version': '1.0', 'category': 'Hidden', 'description': """ Link module for base_partner_merge which extract portal dependency """, - 'author' : 'Camptocamp', + 'author': 'Camptocamp', 'maintainer': 'Camptocamp', 'website': 'http://www.camptocamp.com/', - 'depends' : ['portal', 'base_partner_merge'], + 'depends': ['portal', 'base_partner_merge'], 'data': [], 'test': [], 'installable': True, diff --git a/portal_partner_merge/wizard/portal_wizard.py b/portal_partner_merge/wizard/portal_wizard.py index fceb42e4f0c..a5f5d5394fa 100644 --- a/portal_partner_merge/wizard/portal_wizard.py +++ b/portal_partner_merge/wizard/portal_wizard.py @@ -19,10 +19,11 @@ # ############################################################################## -from openerp.osv import osv +from openerp.osv import orm from openerp.tools.translate import _ -class wizard_user(osv.TransientModel): + +class wizard_user(orm.TransientModel): _inherit = 'portal.wizard.user' def get_error_messages(self, cr, uid, ids, context=None): @@ -35,5 +36,3 @@ def get_error_messages(self, cr, uid, ids, context=None): "Merge wizard, available in the More menu after selecting " "several contacts in the Customers list")) return error_msg - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From c57c4ea5437071418494e93a0c06179aa0368aae Mon Sep 17 00:00:00 2001 From: Sandy Carter Date: Tue, 19 Aug 2014 08:35:31 -0400 Subject: [PATCH 03/11] Fix pep8 (line length) --- portal_partner_merge/__init__.py | 1 + portal_partner_merge/wizard/__init__.py | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/portal_partner_merge/__init__.py b/portal_partner_merge/__init__.py index ba6a8ecaf01..23c6553cdb5 100644 --- a/portal_partner_merge/__init__.py +++ b/portal_partner_merge/__init__.py @@ -18,4 +18,5 @@ # along with this program. If not, see . # ############################################################################## + from . import wizard diff --git a/portal_partner_merge/wizard/__init__.py b/portal_partner_merge/wizard/__init__.py index 4345b14d9a4..2ca6034e024 100644 --- a/portal_partner_merge/wizard/__init__.py +++ b/portal_partner_merge/wizard/__init__.py @@ -19,8 +19,4 @@ # ############################################################################## - from . import portal_wizard - - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From a30101fd7e4f1982116dd30974916bb01a283521 Mon Sep 17 00:00:00 2001 From: Alexandre Fayolle Date: Mon, 2 Mar 2015 17:26:31 +0100 Subject: [PATCH 04/11] Add OCA as author of OCA addons In order to get visibility on https://www.odoo.com/apps the OCA board has decided to add the OCA as author of all the addons maintained as part of the association. --- portal_partner_merge/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal_partner_merge/__openerp__.py b/portal_partner_merge/__openerp__.py index b9848690fd6..e4c1fd87eeb 100644 --- a/portal_partner_merge/__openerp__.py +++ b/portal_partner_merge/__openerp__.py @@ -24,7 +24,7 @@ 'description': """ Link module for base_partner_merge which extract portal dependency """, - 'author': 'Camptocamp', + 'author': "Camptocamp,Odoo Community Association (OCA)", 'maintainer': 'Camptocamp', 'website': 'http://www.camptocamp.com/', 'depends': ['portal', 'base_partner_merge'], From 97bc8e942fd48ffc74f48dc66641e6efa31b4321 Mon Sep 17 00:00:00 2001 From: Yannick Vaucher Date: Tue, 18 Aug 2015 11:29:41 +0200 Subject: [PATCH 05/11] Add missing default oca icons --- portal_partner_merge/static/description/icon.png | Bin 0 -> 9455 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 portal_partner_merge/static/description/icon.png diff --git a/portal_partner_merge/static/description/icon.png b/portal_partner_merge/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z z?n?eq1XP>p-IM$Z^C;2L3itnbJZAip*Zo0aw2bs8@(s^~*8T9go!%dHcAz2lM;`yp zD=7&xjFV$S&5uDaiScyD?B-i1ze`+CoRtz`Wn+Zl&#s4&}MO{@N!ufrzjG$B79)Y2d3tBk&)TxUTw@QS0TEL_?njX|@vq?Uz(nBFK5Pq7*xj#u*R&i|?7+6# z+|r_n#SW&LXhtheZdah{ZVoqwyT{D>MC3nkFF#N)xLi{p7J1jXlmVeb;cP5?e(=f# zuT7fvjSbjS781v?7{)-X3*?>tq?)Yd)~|1{BDS(pqC zC}~H#WXlkUW*H5CDOo<)#x7%RY)A;ShGhI5s*#cRDA8YgqG(HeKDx+#(ZQ?386dv! zlXCO)w91~Vw4AmOcATuV653fa9R$fyK8ul%rG z-wfS zihugoZyr38Im?Zuh6@RcF~t1anQu7>#lPpb#}4cOA!EM11`%f*07RqOVkmX{p~KJ9 z^zP;K#|)$`^Rb{rnHGH{~>1(fawV0*Z#)}M`m8-?ZJV<+e}s9wE# z)l&az?w^5{)`S(%MRzxdNqrs1n*-=jS^_jqE*5XDrA0+VE`5^*p3CuM<&dZEeCjoz zR;uu_H9ZPZV|fQq`Cyw4nscrVwi!fE6ciMmX$!_hN7uF;jjKG)d2@aC4ropY)8etW=xJvni)8eHi`H$%#zn^WJ5NLc-rqk|u&&4Z6fD_m&JfSI1Bvb?b<*n&sfl0^t z=HnmRl`XrFvMKB%9}>PaA`m-fK6a0(8=qPkWS5bb4=v?XcWi&hRY?O5HdulRi4?fN zlsJ*N-0Qw+Yic@s0(2uy%F@ib;GjXt01Fmx5XbRo6+n|pP(&nodMoap^z{~q ziEeaUT@Mxe3vJSfI6?uLND(CNr=#^W<1b}jzW58bIfyWTDle$mmS(|x-0|2UlX+9k zQ^EX7Nw}?EzVoBfT(-LT|=9N@^hcn-_p&sqG z&*oVs2JSU+N4ZD`FhCAWaS;>|wH2G*Id|?pa#@>tyxX`+4HyIArWDvVrX)2WAOQff z0qyHu&-S@i^MS-+j--!pr4fPBj~_8({~e1bfcl0wI1kaoN>mJL6KUPQm5N7lB(ui1 zE-o%kq)&djzWJ}ob<-GfDlkB;F31j-VHKvQUGQ3sp`CwyGJk_i!y^sD0fqC@$9|jO zOqN!r!8-p==F@ZVP=U$qSpY(gQ0)59P1&t@y?5rvg<}E+GB}26NYPp4f2YFQrQtot5mn3wu_qprZ=>Ig-$ zbW26Ws~IgY>}^5w`vTB(G`PTZaDiGBo5o(tp)qli|NeV( z@H_=R8V39rt5J5YB2Ky?4eJJ#b`_iBe2ot~6%7mLt5t8Vwi^Jy7|jWXqa3amOIoRb zOr}WVFP--DsS`1WpN%~)t3R!arKF^Q$e12KEqU36AWwnCBICpH4XCsfnyrHr>$I$4 z!DpKX$OKLWarN7nv@!uIA+~RNO)l$$w}p(;b>mx8pwYvu;dD_unryX_NhT8*Tj>BTrTTL&!?O+%Rv;b?B??gSzdp?6Uug9{ zd@V08Z$BdI?fpoCS$)t4mg4rT8Q_I}h`0d-vYZ^|dOB*Q^S|xqTV*vIg?@fVFSmMpaw0qtTRbx} z({Pg?#{2`sc9)M5N$*N|4;^t$+QP?#mov zGVC@I*lBVrOU-%2y!7%)fAKjpEFsgQc4{amtiHb95KQEwvf<(3T<9-Zm$xIew#P22 zc2Ix|App^>v6(3L_MCU0d3W##AB0M~3D00EWoKZqsJYT(#@w$Y_H7G22M~ApVFTRHMI_3be)Lkn#0F*V8Pq zc}`Cjy$bE;FJ6H7p=0y#R>`}-m4(0F>%@P|?7fx{=R^uFdISRnZ2W_xQhD{YuR3t< z{6yxu=4~JkeA;|(J6_nv#>Nvs&FuLA&PW^he@t(UwFFE8)|a!R{`E`K`i^ZnyE4$k z;(749Ix|oi$c3QbEJ3b~D_kQsPz~fIUKym($a_7dJ?o+40*OLl^{=&oq$<#Q(yyrp z{J-FAniyAw9tPbe&IhQ|a`DqFTVQGQ&Gq3!C2==4x{6EJwiPZ8zub-iXoUtkJiG{} zPaR&}_fn8_z~(=;5lD-aPWD3z8PZS@AaUiomF!G8I}Mf>e~0g#BelA-5#`cj;O5>N Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 From ff49e207c62f08a4d385802767d117a859922d51 Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Tue, 1 Sep 2015 13:48:55 -0400 Subject: [PATCH 06/11] OCA Transbot updated translations from Transifex --- portal_partner_merge/i18n/en.po | 32 +++++++++++++++++++++++++++++ portal_partner_merge/i18n/pt_BR.po | 33 ++++++++++++++++++++++++++++++ portal_partner_merge/i18n/sl.po | 33 ++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+) create mode 100644 portal_partner_merge/i18n/en.po create mode 100644 portal_partner_merge/i18n/pt_BR.po create mode 100644 portal_partner_merge/i18n/sl.po diff --git a/portal_partner_merge/i18n/en.po b/portal_partner_merge/i18n/en.po new file mode 100644 index 00000000000..f06923e0ab2 --- /dev/null +++ b/portal_partner_merge/i18n/en.po @@ -0,0 +1,32 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * portal_partner_merge +# +# Translators: +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-22 13:07+0000\n" +"Last-Translator: Maxime Chambreuil \n" +"Language-Team: English (http://www.transifex.com/oca/OCA-partner-contact-8-0/language/en/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: en\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 "- Merge existing contacts together using the Automatic Merge wizard, available in the More menu after selecting several contacts in the Customers list" + +#. module: portal_partner_merge +#: model:ir.model,name:portal_partner_merge.model_portal_wizard_user +msgid "Portal User Config" +msgstr "Portal User Config" diff --git a/portal_partner_merge/i18n/pt_BR.po b/portal_partner_merge/i18n/pt_BR.po new file mode 100644 index 00000000000..d542a0f1301 --- /dev/null +++ b/portal_partner_merge/i18n/pt_BR.po @@ -0,0 +1,33 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * portal_partner_merge +# +# Translators: +# danimaribeiro , 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 \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" diff --git a/portal_partner_merge/i18n/sl.po b/portal_partner_merge/i18n/sl.po new file mode 100644 index 00000000000..37594f6a9d3 --- /dev/null +++ b/portal_partner_merge/i18n/sl.po @@ -0,0 +1,33 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * portal_partner_merge +# +# Translators: +# Matjaž Mozetič , 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č \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" From 81400b31f72f707aaf2548e39eba3d4121e1d0af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Fri, 9 Oct 2015 10:01:52 +0200 Subject: [PATCH 07/11] [UPD] prefix versions with 8.0 --- portal_partner_merge/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal_partner_merge/__openerp__.py b/portal_partner_merge/__openerp__.py index e4c1fd87eeb..5c29db4c8e4 100644 --- a/portal_partner_merge/__openerp__.py +++ b/portal_partner_merge/__openerp__.py @@ -19,7 +19,7 @@ # ############################################################################## {'name': 'Portal Partner Merge', - 'version': '1.0', + 'version': '8.0.1.0.0', 'category': 'Hidden', 'description': """ Link module for base_partner_merge which extract portal dependency From 149bd0fd9bc678ca4b08b5444df36ea30bed178f Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Wed, 14 Oct 2015 03:30:50 +0200 Subject: [PATCH 08/11] [MIG] Make modules uninstallable --- portal_partner_merge/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal_partner_merge/__openerp__.py b/portal_partner_merge/__openerp__.py index 5c29db4c8e4..48726577d67 100644 --- a/portal_partner_merge/__openerp__.py +++ b/portal_partner_merge/__openerp__.py @@ -30,7 +30,7 @@ 'depends': ['portal', 'base_partner_merge'], 'data': [], 'test': [], - 'installable': True, + 'installable': False, 'auto_install': True, 'application': False, } From ad631871fc302840130d80f2d0ee409cf280d2b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul=20=28ACSONE=29?= Date: Mon, 15 Aug 2016 22:14:02 +0200 Subject: [PATCH 09/11] [FIX] remove en.po that was erroneously created by transbot --- portal_partner_merge/i18n/en.po | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 portal_partner_merge/i18n/en.po diff --git a/portal_partner_merge/i18n/en.po b/portal_partner_merge/i18n/en.po deleted file mode 100644 index f06923e0ab2..00000000000 --- a/portal_partner_merge/i18n/en.po +++ /dev/null @@ -1,32 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * portal_partner_merge -# -# Translators: -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-22 13:07+0000\n" -"Last-Translator: Maxime Chambreuil \n" -"Language-Team: English (http://www.transifex.com/oca/OCA-partner-contact-8-0/language/en/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Language: en\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 "- Merge existing contacts together using the Automatic Merge wizard, available in the More menu after selecting several contacts in the Customers list" - -#. module: portal_partner_merge -#: model:ir.model,name:portal_partner_merge.model_portal_wizard_user -msgid "Portal User Config" -msgstr "Portal User Config" From 08b604d632dd930ce3f29e71f5f5ced63183360e Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Thu, 6 Oct 2016 14:07:32 +0200 Subject: [PATCH 10/11] [MIG] Rename manifest files --- portal_partner_merge/{__openerp__.py => __manifest__.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename portal_partner_merge/{__openerp__.py => __manifest__.py} (100%) diff --git a/portal_partner_merge/__openerp__.py b/portal_partner_merge/__manifest__.py similarity index 100% rename from portal_partner_merge/__openerp__.py rename to portal_partner_merge/__manifest__.py From 2b4fabc57ed8219a40d38c03450db1bdc0850e97 Mon Sep 17 00:00:00 2001 From: "Jay Vora(SerpentCS)" Date: Tue, 9 Jan 2018 19:33:25 +0530 Subject: [PATCH 11/11] [MIG] Migrated portal_partner_merge to 11.0 --- portal_partner_merge/LICENSE/LICENSE | 15 +++++ portal_partner_merge/README.rst | 69 ++++++++++++++++++++ portal_partner_merge/__init__.py | 22 +------ portal_partner_merge/__manifest__.py | 31 ++------- portal_partner_merge/wizard/__init__.py | 22 +------ portal_partner_merge/wizard/portal_wizard.py | 34 ++-------- 6 files changed, 98 insertions(+), 95 deletions(-) create mode 100644 portal_partner_merge/LICENSE/LICENSE create mode 100644 portal_partner_merge/README.rst diff --git a/portal_partner_merge/LICENSE/LICENSE b/portal_partner_merge/LICENSE/LICENSE new file mode 100644 index 00000000000..d0f1fd1c2ed --- /dev/null +++ b/portal_partner_merge/LICENSE/LICENSE @@ -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 . \ No newline at end of file diff --git a/portal_partner_merge/README.rst b/portal_partner_merge/README.rst new file mode 100644 index 00000000000..3b457fb8d67 --- /dev/null +++ b/portal_partner_merge/README.rst @@ -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 +`_. 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 `_. + + +Contributors +------------ + +* Serpent Consulting Services Pvt. Ltd. + + +Author +------ + +* Yannick Vaucher + + +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. diff --git a/portal_partner_merge/__init__.py b/portal_partner_merge/__init__.py index 23c6553cdb5..19d7d3c4ce7 100644 --- a/portal_partner_merge/__init__.py +++ b/portal_partner_merge/__init__.py @@ -1,22 +1,2 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# 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 . -# -############################################################################## - +# See LICENSE file for full copyright and licensing details. from . import wizard diff --git a/portal_partner_merge/__manifest__.py b/portal_partner_merge/__manifest__.py index 48726577d67..937adb78ec3 100644 --- a/portal_partner_merge/__manifest__.py +++ b/portal_partner_merge/__manifest__.py @@ -1,36 +1,15 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# 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 . -# -############################################################################## +# See LICENSE file for full copyright and licensing details. {'name': 'Portal Partner Merge', - 'version': '8.0.1.0.0', + 'version': '11.0.1.0.0', 'category': 'Hidden', - 'description': """ -Link module for base_partner_merge which extract portal dependency - """, 'author': "Camptocamp,Odoo Community Association (OCA)", 'maintainer': 'Camptocamp', + 'license': 'AGPL-3', 'website': 'http://www.camptocamp.com/', 'depends': ['portal', 'base_partner_merge'], 'data': [], 'test': [], - 'installable': False, - 'auto_install': True, + 'installable': True, + 'auto_install': False, 'application': False, } diff --git a/portal_partner_merge/wizard/__init__.py b/portal_partner_merge/wizard/__init__.py index 2ca6034e024..892e98c1e8a 100644 --- a/portal_partner_merge/wizard/__init__.py +++ b/portal_partner_merge/wizard/__init__.py @@ -1,22 +1,2 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Business Applications -# Copyright (c) 2013 OpenERP S.A. -# -# 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 . -# -############################################################################## - +# See LICENSE file for full copyright and licensing details. from . import portal_wizard diff --git a/portal_partner_merge/wizard/portal_wizard.py b/portal_partner_merge/wizard/portal_wizard.py index a5f5d5394fa..242dffceb21 100644 --- a/portal_partner_merge/wizard/portal_wizard.py +++ b/portal_partner_merge/wizard/portal_wizard.py @@ -1,38 +1,18 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Business Applications -# Copyright (c) 2013 OpenERP S.A. -# -# 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 . -# -############################################################################## +# See LICENSE file for full copyright and licensing details. -from openerp.osv import orm -from openerp.tools.translate import _ +from odoo import api, models, _ -class wizard_user(orm.TransientModel): +class PortalWizardUser(models.TransientModel): _inherit = 'portal.wizard.user' - def get_error_messages(self, cr, uid, ids, context=None): - error_msg = super(wizard_user, self - ).get_error_messages(cr, uid, ids, context=context) + @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 More menu after selecting " + "Merge wizard, available in the Action menu after selecting " "several contacts in the Customers list")) return error_msg