diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-12-18 10:32:41 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-12-18 10:32:41 +0100 |
| commit | 2dbe4a696ecd7330b16d10ec38462fe6c8fa37ca (patch) | |
| tree | e7f1103c8b839aa1bffee9dfb961e08b3bc82e26 /addons/fetchmail | |
| parent | 6d2a0d270f0f0b9eb7d66eb384a8803a186db374 (diff) | |
| parent | 73980eba5f64c674b0bc366c714a9a38d3bb915a (diff) | |
[MERGE] Sync wirth trunk.
bzr revid: tde@openerp.com-20121218093241-y0id5g1r1k6yok42
Diffstat (limited to 'addons/fetchmail')
| -rw-r--r-- | addons/fetchmail/fetchmail.py | 10 | ||||
| -rw-r--r-- | addons/fetchmail/i18n/pt_BR.po | 2 | ||||
| -rw-r--r-- | addons/fetchmail/res_config.py | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index e5cd70948cd..fdc37e99ee1 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -32,12 +32,12 @@ except ImportError: import zipfile import base64 -import addons +from openerp import addons -import netsvc -from osv import osv, fields -import tools -from tools.translate import _ +from openerp import netsvc +from openerp.osv import fields, osv +from openerp import tools +from openerp.tools.translate import _ _logger = logging.getLogger(__name__) diff --git a/addons/fetchmail/i18n/pt_BR.po b/addons/fetchmail/i18n/pt_BR.po index 312323158e4..4553a196454 100644 --- a/addons/fetchmail/i18n/pt_BR.po +++ b/addons/fetchmail/i18n/pt_BR.po @@ -15,7 +15,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n" +"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n" "X-Generator: Launchpad (build 16372)\n" #. module: fetchmail diff --git a/addons/fetchmail/res_config.py b/addons/fetchmail/res_config.py index f2447ce7b94..84a50eb22c8 100644 --- a/addons/fetchmail/res_config.py +++ b/addons/fetchmail/res_config.py @@ -19,7 +19,7 @@ # ############################################################################## -from osv import fields, osv +from openerp.osv import fields, osv class fetchmail_config_settings(osv.osv_memory): """ This wizard can be inherited in conjunction with 'res.config.settings', in order to |