From 3db44722d4dba636953c7e340e227d558bc7079b Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Fri, 27 Jun 2014 12:46:56 +0200 Subject: [PATCH 1/4] [FIX] website: correct geoip resolver - "`record_by_addr()` method require the city database. - The loaded geoip database can be specified via config file --- addons/website/models/ir_http.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py index 4d42c9d0643..d96da28e195 100644 --- a/addons/website/models/ir_http.py +++ b/addons/website/models/ir_http.py @@ -2,8 +2,10 @@ import datetime import hashlib import logging +import os import re import traceback + import werkzeug import werkzeug.routing @@ -12,6 +14,7 @@ from openerp.addons.base import ir from openerp.addons.base.ir import ir_qweb from openerp.addons.website.models.website import slug, url_for, _UNSLUG_RE from openerp.http import request +from openerp.tools import config from openerp.osv import orm logger = logging.getLogger(__name__) @@ -54,12 +57,19 @@ class ir_http(orm.AbstractModel): request.website_multilang = request.website_enabled and func and func.routing.get('multilang', True) - if not request.session.has_key('geoip'): + if 'geoip' not in request.session: record = {} if self.geo_ip_resolver is None: try: import GeoIP - self.geo_ip_resolver = GeoIP.open('/usr/share/GeoIP/GeoIP.dat', GeoIP.GEOIP_STANDARD) + # updated database can be downloaded on MaxMind website + # http://dev.maxmind.com/geoip/legacy/install/city/ + geofile = config.get('geoip_database', '/usr/share/GeoIP/GeoLiteCity.dat') + if os.path.exists(geofile): + self.geo_ip_resolver = GeoIP.open(geofile, GeoIP.GEOIP_STANDARD) + else: + self.geo_ip_resolver = False + logger.warning('GeoIP database file %r does not exists', geofile) except ImportError: self.geo_ip_resolver = False if self.geo_ip_resolver and request.httprequest.remote_addr: From f9e63ad3c50d9af0e555c61aa2982cc164a30bd6 Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Fri, 27 Jun 2014 14:02:25 +0200 Subject: [PATCH 2/4] [FIX] livechat is no more under an openerp container --- addons/im/static/src/css/im.css | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/addons/im/static/src/css/im.css b/addons/im/static/src/css/im.css index b17b4dfaa70..d383ffac07d 100644 --- a/addons/im/static/src/css/im.css +++ b/addons/im/static/src/css/im.css @@ -1,5 +1,5 @@ -.openerp .oe_im { +.oe_im { position: fixed; background-color: #E8EBEF; width: 220px; @@ -7,7 +7,7 @@ } @media print { - .openerp .oe_im, .openerp .oe_im_chatview { + .oe_im, .oe_im_chatview { visibility: hidden; } } @@ -15,13 +15,13 @@ .oe_systray #oe_topbar_im_icon { color: white; } -.openerp .oe_topbar_item.oe_topbar_imbutton .oe_e { +.oe_topbar_item.oe_topbar_imbutton .oe_e { position: relative; top: -8px; } /* search stuff */ -.openerp .oe_im_frame_header { +.oe_im_frame_header { position: relative; background: #dedede; background: -moz-linear-gradient(#fcfcfc, #dedede); @@ -29,7 +29,7 @@ border-bottom: 1px solid border-color !important; padding: 5px; } -.openerp .oe_im_frame_header .oe_im_searchbox { +.oe_im_frame_header .oe_im_searchbox { width: 168px; padding: 1px 21px 1px 19px; font-size: 13px; @@ -37,7 +37,7 @@ -webkit-border-radius: 13px; border-radius: 13px; } -.openerp .oe_im_frame_header .oe_im_search_icon { +.oe_im_frame_header .oe_im_search_icon { position: absolute; color: #888; top: 2px; @@ -46,7 +46,7 @@ font-family: "entypoRegular" !important; font-weight: 300 !important; } -.openerp .oe_im_frame_header .oe_im_search_clear { +.oe_im_frame_header .oe_im_search_clear { display: none; position: absolute; right: 11px; @@ -55,26 +55,26 @@ color: #b6b6b6; cursor: pointer; } -.openerp .oe_im_frame_header .oe_im_search_clear:hover { +.oe_im_frame_header .oe_im_search_clear:hover { color: #888; } /* users */ -.openerp .oe_im_users { +.oe_im_users { padding-bottom: 38px; } -.openerp .oe_im_user { +.oe_im_user { position: relative; padding: 2px 6px; cursor: pointer; font-size: 13px; margin-bottom: 3px; } -.openerp .oe_im_user:hover { +.oe_im_user:hover { background: lightGrey; } -.openerp .oe_im_user_clip { +.oe_im_user_clip { display: inline-block; width: 26px; height: 26px; @@ -83,11 +83,11 @@ -webkit-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.25); box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.25); } -.openerp .oe_im_user_avatar { +.oe_im_user_avatar { width: 26px; height: auto; } -.openerp .oe_im_user_name { +.oe_im_user_name { width: 162px; line-height: 26px; padding-right: 15px; @@ -97,7 +97,7 @@ position: relative; } -.openerp .oe_im_user_online { +.oe_im_user_online { display: none; position: absolute; top: 9.5px; From 0b6404bd9d6edc6ad4b7bc2644275b4e7c06eca7 Mon Sep 17 00:00:00 2001 From: Darshan Kalola Date: Fri, 27 Jun 2014 14:06:07 +0200 Subject: [PATCH 3/4] [REM] plugin/plugin_outlook/plugin_thunderbird Unsupported modules, moved to https://github.com/odoo/odoo-extra. Closes #804 --- addons/base_setup/res_config.py | 15 +- addons/base_setup/res_config_view.xml | 15 +- addons/crm/res_config_view.xml | 2 +- addons/plugin/__init__.py | 25 - addons/plugin/__openerp__.py | 41 - addons/plugin/i18n/ar.po | 23 - addons/plugin/i18n/cs.po | 23 - addons/plugin/i18n/de.po | 23 - addons/plugin/i18n/es.po | 23 - addons/plugin/i18n/es_CR.po | 23 - addons/plugin/i18n/fi.po | 23 - addons/plugin/i18n/fr.po | 24 - addons/plugin/i18n/hr.po | 23 - addons/plugin/i18n/hu.po | 23 - addons/plugin/i18n/it.po | 23 - addons/plugin/i18n/ja.po | 23 - addons/plugin/i18n/lt.po | 23 - addons/plugin/i18n/mk.po | 23 - addons/plugin/i18n/mn.po | 23 - addons/plugin/i18n/nb.po | 23 - addons/plugin/i18n/nl.po | 23 - addons/plugin/i18n/plugin.pot | 22 - addons/plugin/i18n/pt.po | 23 - addons/plugin/i18n/pt_BR.po | 23 - addons/plugin/i18n/ro.po | 23 - addons/plugin/i18n/ru.po | 23 - addons/plugin/i18n/sl.po | 23 - addons/plugin/i18n/sv.po | 23 - addons/plugin/i18n/tr.po | 23 - addons/plugin/i18n/zh_CN.po | 23 - addons/plugin/i18n/zh_TW.po | 23 - addons/plugin/plugin_handler.py | 181 --- addons/plugin_outlook/__init__.py | 24 - addons/plugin_outlook/__openerp__.py | 46 - addons/plugin_outlook/i18n/ar.po | 98 -- addons/plugin_outlook/i18n/bg.po | 101 -- addons/plugin_outlook/i18n/ca.po | 107 -- addons/plugin_outlook/i18n/cs.po | 89 -- addons/plugin_outlook/i18n/da.po | 89 -- addons/plugin_outlook/i18n/de.po | 118 -- addons/plugin_outlook/i18n/el.po | 101 -- addons/plugin_outlook/i18n/es.po | 117 -- addons/plugin_outlook/i18n/es_CR.po | 115 -- addons/plugin_outlook/i18n/es_MX.po | 162 --- addons/plugin_outlook/i18n/es_VE.po | 162 --- addons/plugin_outlook/i18n/et.po | 101 -- addons/plugin_outlook/i18n/fi.po | 103 -- addons/plugin_outlook/i18n/fr.po | 119 -- addons/plugin_outlook/i18n/gl.po | 107 -- addons/plugin_outlook/i18n/hr.po | 107 -- addons/plugin_outlook/i18n/hu.po | 106 -- addons/plugin_outlook/i18n/id.po | 89 -- addons/plugin_outlook/i18n/it.po | 107 -- addons/plugin_outlook/i18n/ja.po | 110 -- addons/plugin_outlook/i18n/mk.po | 91 -- addons/plugin_outlook/i18n/mn.po | 114 -- addons/plugin_outlook/i18n/nb.po | 114 -- addons/plugin_outlook/i18n/nl.po | 117 -- addons/plugin_outlook/i18n/pl.po | 106 -- addons/plugin_outlook/i18n/plugin_outlook.pot | 86 -- addons/plugin_outlook/i18n/pt.po | 110 -- addons/plugin_outlook/i18n/pt_BR.po | 115 -- addons/plugin_outlook/i18n/ro.po | 117 -- addons/plugin_outlook/i18n/ru.po | 106 -- addons/plugin_outlook/i18n/sl.po | 105 -- addons/plugin_outlook/i18n/sr@latin.po | 92 -- addons/plugin_outlook/i18n/sv.po | 117 -- addons/plugin_outlook/i18n/tr.po | 116 -- addons/plugin_outlook/i18n/zh_CN.po | 110 -- addons/plugin_outlook/plugin_outlook.py | 42 - addons/plugin_outlook/plugin_outlook.xml | 88 -- .../CookComputing.XmlRpcV2.dll | Bin 135168 -> 0 bytes .../OpenERPClient/Model.cs | 78 -- .../OpenERPClient/OpenERPClient.csproj | 105 -- .../OpenERPClient/OpenERPConnect.cs | 383 ------ .../OpenERPClient/Properties/AssemblyInfo.cs | 36 - .../OpenERPClient/Record.cs | 69 -- .../OpenERPClient/XMLRPCClient.cs | 379 ------ .../OpenERPOutlookPlugin.sln | 30 - .../OpenERPOutlookPlugin/AssemblyInfo.cs | 52 - .../OpenERPOutlookPlugin/Cache.cs | 55 - .../OpenERPOutlookPlugin/ConfigManager.cs | 109 -- .../OpenERPOutlookPlugin/Connect.cs | 355 ------ .../OpenERPOutlookPlugin.cs | 238 ---- .../OpenERPOutlookPlugin.csproj | 279 ----- .../OpenERPOutlookPlugin.csproj.user | 12 - .../Properties/Resources.Designer.cs | 119 -- .../Properties/Resources.resx | 145 --- .../Properties/Settings.Designer.cs | 26 - .../Properties/Settings.settings | 6 - .../195737_152643643962_3595480_n.jpg | Bin 6784 -> 0 bytes .../Resources/Account.ico | Bin 1150 -> 0 bytes .../Resources/Account.png | Bin 897 -> 0 bytes .../Resources/Archive.png | Bin 852 -> 0 bytes .../OpenERPOutlookPlugin/Resources/Case.png | Bin 816 -> 0 bytes .../Resources/Contact.png | Bin 703 -> 0 bytes .../OpenERPOutlookPlugin/Resources/Create.png | Bin 888 -> 0 bytes .../OpenERPOutlookPlugin/Resources/Error.gif | Bin 1037 -> 0 bytes .../Resources/Invoice.png | Bin 852 -> 0 bytes .../OpenERPOutlookPlugin/Resources/Move.gif | Bin 155 -> 0 bytes .../Resources/MoveDown.png | Bin 352 -> 0 bytes .../Resources/MoveLeft.png | Bin 363 -> 0 bytes .../Resources/OpenERP_icon.ico | Bin 12862 -> 0 bytes .../Resources/Partner.png | Bin 790 -> 0 bytes .../Resources/Product.png | Bin 796 -> 0 bytes .../Resources/Project.png | Bin 823 -> 0 bytes .../OpenERPOutlookPlugin/Resources/Sale.png | Bin 802 -> 0 bytes .../OpenERPOutlookPlugin/Resources/Search.gif | Bin 582 -> 0 bytes .../Resources/Success.gif | Bin 604 -> 0 bytes .../OpenERPOutlookPlugin/Resources/Task.png | Bin 867 -> 0 bytes .../Resources/developped_by.png | Bin 7192 -> 0 bytes .../OpenERPOutlookPlugin/Resources/logo.png | Bin 3981 -> 0 bytes .../Resources/openerp.png | Bin 2611 -> 0 bytes .../Resources/perform.gif | Bin 89 -> 0 bytes .../Resources/settings.png | Bin 2455 -> 0 bytes .../OpenERPOutlookPlugin/Tools.cs | 173 --- .../frm_choose_document_opt.Designer.cs | 137 --- .../frm_choose_document_opt.cs | 98 -- .../frm_choose_document_opt.resx | 153 --- .../OpenERPOutlookPlugin/frm_contact.cs | 77 -- .../frm_contact.designer.cs | 166 --- .../OpenERPOutlookPlugin/frm_contact.resx | 180 --- .../frm_create_doc.Designer.cs | 127 -- .../OpenERPOutlookPlugin/frm_create_doc.cs | 79 -- .../OpenERPOutlookPlugin/frm_create_doc.resx | 145 --- .../frm_openerp_configuration.Designer.cs | 334 ------ .../frm_openerp_configuration.cs | 216 ---- .../frm_openerp_configuration.resx | 455 ------- .../frm_openerp_connection.Designer.cs | 163 --- .../frm_openerp_connection.cs | 108 -- .../frm_openerp_connection.resx | 180 --- .../OpenERPOutlookPlugin/frm_partner.cs | 77 -- .../frm_partner.designer.cs | 106 -- .../OpenERPOutlookPlugin/frm_partner.resx | 180 --- .../OpenERPOutlookPlugin/frm_push_mail.cs | 149 --- .../frm_push_mail.designer.cs | 202 ---- .../OpenERPOutlookPlugin/frm_push_mail.resx | 145 --- .../frm_select_partner.Designer.cs | 141 --- .../frm_select_partner.cs | 121 -- .../frm_select_partner.resx | 194 --- .../OpenERPOutlookPluginSetup.vdproj | 988 ---------------- .../OpenERPOutlookPluginSetup32.msi | Bin 939008 -> 0 bytes .../OpenERPOutlookPluginSetup64.msi | Bin 939008 -> 0 bytes addons/plugin_thunderbird/__init__.py | 22 - addons/plugin_thunderbird/__openerp__.py | 44 - addons/plugin_thunderbird/i18n/ar.po | 125 -- addons/plugin_thunderbird/i18n/bg.po | 128 -- addons/plugin_thunderbird/i18n/ca.po | 147 --- addons/plugin_thunderbird/i18n/cs.po | 146 --- addons/plugin_thunderbird/i18n/da.po | 128 -- addons/plugin_thunderbird/i18n/de.po | 154 --- addons/plugin_thunderbird/i18n/en_GB.po | 119 -- addons/plugin_thunderbird/i18n/en_US.po | 116 -- addons/plugin_thunderbird/i18n/es.po | 151 --- addons/plugin_thunderbird/i18n/es_CR.po | 148 --- addons/plugin_thunderbird/i18n/et.po | 119 -- addons/plugin_thunderbird/i18n/eu.po | 119 -- addons/plugin_thunderbird/i18n/fi.po | 146 --- addons/plugin_thunderbird/i18n/fr.po | 153 --- addons/plugin_thunderbird/i18n/gl.po | 147 --- addons/plugin_thunderbird/i18n/hr.po | 152 --- addons/plugin_thunderbird/i18n/hu.po | 151 --- addons/plugin_thunderbird/i18n/is.po | 147 --- addons/plugin_thunderbird/i18n/it.po | 151 --- addons/plugin_thunderbird/i18n/ja.po | 143 --- addons/plugin_thunderbird/i18n/mk.po | 118 -- addons/plugin_thunderbird/i18n/mn.po | 147 --- addons/plugin_thunderbird/i18n/nb.po | 146 --- addons/plugin_thunderbird/i18n/nl.po | 150 --- addons/plugin_thunderbird/i18n/pl.po | 119 -- .../i18n/plugin_thunderbird.pot | 110 -- addons/plugin_thunderbird/i18n/pt.po | 147 --- addons/plugin_thunderbird/i18n/pt_BR.po | 150 --- addons/plugin_thunderbird/i18n/ro.po | 152 --- addons/plugin_thunderbird/i18n/ru.po | 148 --- addons/plugin_thunderbird/i18n/sk.po | 119 -- addons/plugin_thunderbird/i18n/sl.po | 147 --- addons/plugin_thunderbird/i18n/sr.po | 119 -- addons/plugin_thunderbird/i18n/sr@latin.po | 119 -- addons/plugin_thunderbird/i18n/sv.po | 147 --- addons/plugin_thunderbird/i18n/tr.po | 149 --- addons/plugin_thunderbird/i18n/zh_CN.po | 143 --- .../plugin_thunderbird/plugin_thunderbird.py | 45 - .../plugin_thunderbird/plugin_thunderbird.xml | 74 -- .../static/openerp_plugin.xpi | Bin 109399 -> 0 bytes .../static/thunderbird_plugin/chrome.manifest | 9 - .../chrome/openerp_plugin.jar | Bin 48181 -> 0 bytes .../chrome/openerp_plugin/content/config.xul | 86 -- .../openerp_plugin/content/config_change.xul | 42 - .../chrome/openerp_plugin/content/create.xul | 49 - .../openerp_plugin/content/js/config.js | 122 -- .../openerp_plugin/content/js/create.js | 123 -- .../openerp_plugin/content/js/dialog.js | 13 - .../openerp_plugin/content/js/overlay.js | 142 --- .../chrome/openerp_plugin/content/js/push.js | 154 --- .../openerp_plugin/content/js/tiny_xmlrpc.js | 421 ------- .../chrome/openerp_plugin/content/js/tools.js | 91 -- .../chrome/openerp_plugin/content/overlay.xul | 55 - .../chrome/openerp_plugin/content/push.xul | 56 - .../openerp_plugin/content/push_dialog.xul | 22 - .../openerp_plugin/content/push_new.xul | 37 - .../openerp_plugin/content/selectpartner.xul | 31 - .../chrome/openerp_plugin/content/style.css | 10 - .../openerp_plugin/locale/en-US/address.dtd | 26 - .../openerp_plugin/locale/en-US/config.dtd | 56 - .../locale/en-US/config_change.dtd | 6 - .../openerp_plugin/locale/en-US/create.dtd | 37 - .../locale/en-US/mboximport.properties | 31 - .../openerp_plugin/locale/en-US/overlay.dtd | 18 - .../openerp_plugin/locale/en-US/plugin.dtd | 31 - .../locale/en-US/selectpartner.dtd | 12 - .../chrome/openerp_plugin/skin/Archive.png | Bin 852 -> 0 bytes .../chrome/openerp_plugin/skin/Create.png | Bin 888 -> 0 bytes .../chrome/openerp_plugin/skin/Error.gif | Bin 1037 -> 0 bytes .../chrome/openerp_plugin/skin/Move.gif | Bin 155 -> 0 bytes .../chrome/openerp_plugin/skin/MoveDown.png | Bin 352 -> 0 bytes .../chrome/openerp_plugin/skin/MoveLeft.png | Bin 363 -> 0 bytes .../chrome/openerp_plugin/skin/Search.gif | Bin 582 -> 0 bytes .../chrome/openerp_plugin/skin/Success.gif | Bin 604 -> 0 bytes .../openerp_plugin/skin/developped_by.png | Bin 7192 -> 0 bytes .../chrome/openerp_plugin/skin/logo.png | Bin 3981 -> 0 bytes .../chrome/openerp_plugin/skin/openerp.png | Bin 2611 -> 0 bytes .../chrome/openerp_plugin/skin/overlay.css | 3 - .../chrome/openerp_plugin/skin/perform.gif | Bin 89 -> 0 bytes .../chrome/openerp_plugin/skin/settings.png | Bin 2455 -> 0 bytes .../openerp_plugin/skin/tinyerp-icon.ico | Bin 1150 -> 0 bytes .../components/nsXmlRpcClient.js | 1049 ----------------- .../thunderbird_plugin/components/xml-rpc.xpt | Bin 1011 -> 0 bytes .../defaults/preferences/tiny.js | 63 - .../static/thunderbird_plugin/install.js | 105 -- .../static/thunderbird_plugin/install.rdf | 22 - .../static/thunderbird_plugin/install.sh | 4 - .../static/thunderbird_plugin/makefile | 11 - 233 files changed, 3 insertions(+), 20710 deletions(-) delete mode 100644 addons/plugin/__init__.py delete mode 100644 addons/plugin/__openerp__.py delete mode 100644 addons/plugin/i18n/ar.po delete mode 100644 addons/plugin/i18n/cs.po delete mode 100644 addons/plugin/i18n/de.po delete mode 100644 addons/plugin/i18n/es.po delete mode 100644 addons/plugin/i18n/es_CR.po delete mode 100644 addons/plugin/i18n/fi.po delete mode 100644 addons/plugin/i18n/fr.po delete mode 100644 addons/plugin/i18n/hr.po delete mode 100644 addons/plugin/i18n/hu.po delete mode 100644 addons/plugin/i18n/it.po delete mode 100644 addons/plugin/i18n/ja.po delete mode 100644 addons/plugin/i18n/lt.po delete mode 100644 addons/plugin/i18n/mk.po delete mode 100644 addons/plugin/i18n/mn.po delete mode 100644 addons/plugin/i18n/nb.po delete mode 100644 addons/plugin/i18n/nl.po delete mode 100644 addons/plugin/i18n/plugin.pot delete mode 100644 addons/plugin/i18n/pt.po delete mode 100644 addons/plugin/i18n/pt_BR.po delete mode 100644 addons/plugin/i18n/ro.po delete mode 100644 addons/plugin/i18n/ru.po delete mode 100644 addons/plugin/i18n/sl.po delete mode 100644 addons/plugin/i18n/sv.po delete mode 100644 addons/plugin/i18n/tr.po delete mode 100644 addons/plugin/i18n/zh_CN.po delete mode 100644 addons/plugin/i18n/zh_TW.po delete mode 100644 addons/plugin/plugin_handler.py delete mode 100644 addons/plugin_outlook/__init__.py delete mode 100644 addons/plugin_outlook/__openerp__.py delete mode 100644 addons/plugin_outlook/i18n/ar.po delete mode 100644 addons/plugin_outlook/i18n/bg.po delete mode 100644 addons/plugin_outlook/i18n/ca.po delete mode 100644 addons/plugin_outlook/i18n/cs.po delete mode 100644 addons/plugin_outlook/i18n/da.po delete mode 100644 addons/plugin_outlook/i18n/de.po delete mode 100644 addons/plugin_outlook/i18n/el.po delete mode 100644 addons/plugin_outlook/i18n/es.po delete mode 100644 addons/plugin_outlook/i18n/es_CR.po delete mode 100644 addons/plugin_outlook/i18n/es_MX.po delete mode 100644 addons/plugin_outlook/i18n/es_VE.po delete mode 100644 addons/plugin_outlook/i18n/et.po delete mode 100644 addons/plugin_outlook/i18n/fi.po delete mode 100644 addons/plugin_outlook/i18n/fr.po delete mode 100644 addons/plugin_outlook/i18n/gl.po delete mode 100644 addons/plugin_outlook/i18n/hr.po delete mode 100644 addons/plugin_outlook/i18n/hu.po delete mode 100644 addons/plugin_outlook/i18n/id.po delete mode 100644 addons/plugin_outlook/i18n/it.po delete mode 100644 addons/plugin_outlook/i18n/ja.po delete mode 100644 addons/plugin_outlook/i18n/mk.po delete mode 100644 addons/plugin_outlook/i18n/mn.po delete mode 100644 addons/plugin_outlook/i18n/nb.po delete mode 100644 addons/plugin_outlook/i18n/nl.po delete mode 100644 addons/plugin_outlook/i18n/pl.po delete mode 100644 addons/plugin_outlook/i18n/plugin_outlook.pot delete mode 100644 addons/plugin_outlook/i18n/pt.po delete mode 100644 addons/plugin_outlook/i18n/pt_BR.po delete mode 100644 addons/plugin_outlook/i18n/ro.po delete mode 100644 addons/plugin_outlook/i18n/ru.po delete mode 100644 addons/plugin_outlook/i18n/sl.po delete mode 100644 addons/plugin_outlook/i18n/sr@latin.po delete mode 100644 addons/plugin_outlook/i18n/sv.po delete mode 100644 addons/plugin_outlook/i18n/tr.po delete mode 100644 addons/plugin_outlook/i18n/zh_CN.po delete mode 100644 addons/plugin_outlook/plugin_outlook.py delete mode 100644 addons/plugin_outlook/plugin_outlook.xml delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/CookComputing.XmlRpcV2.dll delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/Model.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPClient.csproj delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPConnect.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/Properties/AssemblyInfo.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/Record.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/XMLRPCClient.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin.sln delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/AssemblyInfo.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Cache.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/ConfigManager.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Connect.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj.user delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Resources.Designer.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Resources.resx delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Settings.Designer.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Settings.settings delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/195737_152643643962_3595480_n.jpg delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Account.ico delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Account.png delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Archive.png delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Case.png delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Contact.png delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Create.png delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Error.gif delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Invoice.png delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Move.gif delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/MoveDown.png delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/MoveLeft.png delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/OpenERP_icon.ico delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Partner.png delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Product.png delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Project.png delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Sale.png delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Search.gif delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Success.gif delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Task.png delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/developped_by.png delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/logo.png delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/openerp.png delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/perform.gif delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/settings.png delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Tools.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.Designer.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.resx delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.designer.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.resx delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.Designer.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.resx delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.Designer.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.resx delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.Designer.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.resx delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.designer.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.resx delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.designer.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.resx delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.Designer.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.cs delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.resx delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup/OpenERPOutlookPluginSetup.vdproj delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi delete mode 100644 addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi delete mode 100644 addons/plugin_thunderbird/__init__.py delete mode 100644 addons/plugin_thunderbird/__openerp__.py delete mode 100644 addons/plugin_thunderbird/i18n/ar.po delete mode 100644 addons/plugin_thunderbird/i18n/bg.po delete mode 100644 addons/plugin_thunderbird/i18n/ca.po delete mode 100644 addons/plugin_thunderbird/i18n/cs.po delete mode 100644 addons/plugin_thunderbird/i18n/da.po delete mode 100644 addons/plugin_thunderbird/i18n/de.po delete mode 100644 addons/plugin_thunderbird/i18n/en_GB.po delete mode 100644 addons/plugin_thunderbird/i18n/en_US.po delete mode 100644 addons/plugin_thunderbird/i18n/es.po delete mode 100644 addons/plugin_thunderbird/i18n/es_CR.po delete mode 100644 addons/plugin_thunderbird/i18n/et.po delete mode 100644 addons/plugin_thunderbird/i18n/eu.po delete mode 100644 addons/plugin_thunderbird/i18n/fi.po delete mode 100644 addons/plugin_thunderbird/i18n/fr.po delete mode 100644 addons/plugin_thunderbird/i18n/gl.po delete mode 100644 addons/plugin_thunderbird/i18n/hr.po delete mode 100644 addons/plugin_thunderbird/i18n/hu.po delete mode 100644 addons/plugin_thunderbird/i18n/is.po delete mode 100644 addons/plugin_thunderbird/i18n/it.po delete mode 100644 addons/plugin_thunderbird/i18n/ja.po delete mode 100644 addons/plugin_thunderbird/i18n/mk.po delete mode 100644 addons/plugin_thunderbird/i18n/mn.po delete mode 100644 addons/plugin_thunderbird/i18n/nb.po delete mode 100644 addons/plugin_thunderbird/i18n/nl.po delete mode 100644 addons/plugin_thunderbird/i18n/pl.po delete mode 100644 addons/plugin_thunderbird/i18n/plugin_thunderbird.pot delete mode 100644 addons/plugin_thunderbird/i18n/pt.po delete mode 100644 addons/plugin_thunderbird/i18n/pt_BR.po delete mode 100644 addons/plugin_thunderbird/i18n/ro.po delete mode 100644 addons/plugin_thunderbird/i18n/ru.po delete mode 100644 addons/plugin_thunderbird/i18n/sk.po delete mode 100644 addons/plugin_thunderbird/i18n/sl.po delete mode 100644 addons/plugin_thunderbird/i18n/sr.po delete mode 100644 addons/plugin_thunderbird/i18n/sr@latin.po delete mode 100644 addons/plugin_thunderbird/i18n/sv.po delete mode 100644 addons/plugin_thunderbird/i18n/tr.po delete mode 100644 addons/plugin_thunderbird/i18n/zh_CN.po delete mode 100644 addons/plugin_thunderbird/plugin_thunderbird.py delete mode 100644 addons/plugin_thunderbird/plugin_thunderbird.xml delete mode 100644 addons/plugin_thunderbird/static/openerp_plugin.xpi delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome.manifest delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin.jar delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/config.xul delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/config_change.xul delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/create.xul delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/config.js delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/create.js delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/dialog.js delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/overlay.js delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/push.js delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/tiny_xmlrpc.js delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/tools.js delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/overlay.xul delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/push.xul delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/push_dialog.xul delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/push_new.xul delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/selectpartner.xul delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/style.css delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/address.dtd delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/config.dtd delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/config_change.dtd delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/create.dtd delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/mboximport.properties delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/plugin.dtd delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/selectpartner.dtd delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Archive.png delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Create.png delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Error.gif delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Move.gif delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/MoveDown.png delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/MoveLeft.png delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Search.gif delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Success.gif delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/developped_by.png delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/logo.png delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/openerp.png delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/overlay.css delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/perform.gif delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/settings.png delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/tinyerp-icon.ico delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/components/nsXmlRpcClient.js delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/components/xml-rpc.xpt delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/defaults/preferences/tiny.js delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/install.js delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/install.rdf delete mode 100755 addons/plugin_thunderbird/static/thunderbird_plugin/install.sh delete mode 100644 addons/plugin_thunderbird/static/thunderbird_plugin/makefile diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py index 955591e8824..546513344bb 100644 --- a/addons/base_setup/res_config.py +++ b/addons/base_setup/res_config.py @@ -81,8 +81,7 @@ class base_config_settings(osv.osv_memory): return self.pool.get("res.font").font_scan(cr, uid, context=context) # Preferences wizard for Sales & CRM. -# It is defined here because it is inherited independently in modules sale, crm, -# plugin_outlook and plugin_thunderbird. +# It is defined here because it is inherited independently in modules sale, crm. class sale_config_settings(osv.osv_memory): _name = 'sale.config.settings' _inherit = 'res.config.settings' @@ -91,18 +90,6 @@ class sale_config_settings(osv.osv_memory): help="""When you create a new contact (person or company), you will be able to load all the data from LinkedIn (photos, address, etc)."""), 'module_crm': fields.boolean('CRM'), 'module_sale' : fields.boolean('SALE'), - 'module_plugin_thunderbird': fields.boolean('Enable Thunderbird plug-in', - help='The plugin allows you archive email and its attachments to the selected ' - 'OpenERP objects. You can select a partner, or a lead and ' - 'attach the selected mail as a .eml file in ' - 'the attachment of a selected record. You can create documents for CRM Lead, ' - 'Partner from the selected emails.\n' - '-This installs the module plugin_thunderbird.'), - 'module_plugin_outlook': fields.boolean('Enable Outlook plug-in', - help='The Outlook plugin allows you to select an object that you would like to add ' - 'to your email and its attachments from MS Outlook. You can select a partner, ' - 'or a lead object and archive a selected email into an OpenERP mail message with attachments.\n' - '-This installs the module plugin_outlook.'), 'module_mass_mailing': fields.boolean( 'Manage mass mailing campaigns', help='Get access to statistics with your mass mailing, manage campaigns.'), diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml index 1ec7aab7d22..b5fa051a9b6 100644 --- a/addons/base_setup/res_config_view.xml +++ b/addons/base_setup/res_config_view.xml @@ -159,26 +159,13 @@
-

+

OpenERP allows to automatically create leads (or others documents) from incoming emails. You can automatically synchronize emails with OpenERP using regular POP/IMAP accounts, using a direct email integration script for your email server, or by manually pushing emails to OpenERP using specific plugins for your preferred email application.

- -
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml index cc7bb6b2e4a..bf586c8b30e 100644 --- a/addons/crm/res_config_view.xml +++ b/addons/crm/res_config_view.xml @@ -33,7 +33,7 @@
- +