[MERGE] merged from trunk development branch

bzr revid: hmo@tinyerp.com-20110914073732-ih8qwnzl03phbloc
This commit is contained in:
Harry (OpenERP) 2011-09-14 13:07:32 +05:30
commit 8dc1e7d9a4
160 changed files with 1776 additions and 1292 deletions

4
debian/po/bg.po vendored
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/ca.po vendored
View File

@ -15,8 +15,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/cs.po vendored
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/da.po vendored
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/de.po vendored
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/el.po vendored
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/en_GB.po vendored
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/es.po vendored
View File

@ -15,8 +15,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/es_CL.po vendored
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/es_EC.po vendored
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/fa.po vendored
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/fi.po vendored
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/fr.po vendored
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/gl.po vendored
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/he.po vendored
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/hr.po vendored
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/hu.po vendored
View File

@ -15,8 +15,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/it.po vendored
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/ja.po vendored
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/ko.po vendored
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/lv.po vendored
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/mn.po vendored
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/nb.po vendored
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/nl.po vendored
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/pl.po vendored
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/pt.po vendored
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/pt_BR.po vendored
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/ro.po vendored
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/ru.po vendored
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/sk.po vendored
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/sq.po vendored
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/sr.po vendored
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/sv.po vendored
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n"
"X-Generator: Launchpad (build 13827)\n"
"X-Poedit-Language: Swedish\n"
#. Type: string

4
debian/po/tr.po vendored
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/uk.po vendored
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/vi.po vendored
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/zh_CN.po vendored
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. Type: string
#. Description

4
debian/po/zh_TW.po vendored
View File

@ -12,8 +12,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n"
"X-Generator: Launchpad (build 13827)\n"
"X-Poedit-Country: TAIWAN\n"
"X-Poedit-Language: Chinese\n"
"X-Poedit-SourceCharset: utf-8\n"

View File

@ -30,9 +30,6 @@ GNU Public Licence.
(c) 2003-TODAY, Fabien Pinckaers - OpenERP s.a.
"""
#----------------------------------------------------------
# python imports
#----------------------------------------------------------
import logging
import os
import signal
@ -45,139 +42,140 @@ import openerp
__author__ = openerp.release.author
__version__ = openerp.release.version
if os.name == 'posix':
import pwd
# We DON't log this using the standard logger, because we might mess
# with the logfile's permissions. Just do a quick exit here.
if pwd.getpwuid(os.getuid())[0] == 'root' :
sys.stderr.write("Attempted to run OpenERP server as root. This is not good, aborting.\n")
def check_root_user():
""" Exit if the process's user is 'root' (on POSIX system)."""
if os.name == 'posix':
import pwd
if pwd.getpwuid(os.getuid())[0] == 'root' :
sys.stderr.write("Running as user 'root' is a security risk, aborting.\n")
sys.exit(1)
def check_postgres_user():
""" Exit if the configured database user is 'postgres'.
This function assumes the configuration has been initialized.
"""
config = openerp.tools.config
if config['db_user'] == 'postgres':
sys.stderr.write("Using the database user 'postgres' is a security risk, aborting.")
sys.exit(1)
#-----------------------------------------------------------------------
# parse the command line
#-----------------------------------------------------------------------
openerp.tools.config.parse_config(sys.argv[1:])
config = openerp.tools.config
def report_configuration():
""" Log the server version and some configuration values.
#----------------------------------------------------------
# get logger
#----------------------------------------------------------
openerp.netsvc.init_logger()
logger = logging.getLogger('server')
This function assumes the configuration has been initialized.
"""
config = openerp.tools.config
logger = logging.getLogger('server')
logger.info("OpenERP version %s", __version__)
for name, value in [('addons paths', config['addons_path']),
('database hostname', config['db_host'] or 'localhost'),
('database port', config['db_port'] or '5432'),
('database user', config['db_user'])]:
logger.info("%s: %s", name, value)
logger.info("OpenERP version - %s", __version__)
for name, value in [('addons_path', config['addons_path']),
('database hostname', config['db_host'] or 'localhost'),
('database port', config['db_port'] or '5432'),
('database user', config['db_user'])]:
logger.info("%s - %s", name, value)
def setup_pid_file():
""" Create a file with the process id written in it.
# Don't allow if the connection to PostgreSQL done by postgres user
if config['db_user'] == 'postgres':
logger.error("Connecting to the database as 'postgres' user is forbidden, as it present major security issues. Shutting down.")
sys.exit(1)
This function assumes the configuration has been initialized.
"""
config = openerp.tools.config
if config['pidfile']:
fd = open(config['pidfile'], 'w')
pidtext = "%d" % (os.getpid())
fd.write(pidtext)
fd.close()
#----------------------------------------------------------
# init net service
#----------------------------------------------------------
logger.info('initialising distributed objects services')
def preload_registry(dbname):
""" Preload a registry, and start the cron."""
db, pool = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False)
pool.get('ir.cron').restart(db.dbname)
#----------------------------------------------------------
# Load and update databases if requested
#----------------------------------------------------------
def run_test_file(dbname, test_file):
""" Preload a registry, possibly run a test file, and start the cron."""
db, pool = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False)
if not ( config["stop_after_init"] or \
config["translate_in"] or \
config["translate_out"] ):
openerp.osv.osv.start_object_proxy()
openerp.service.web_services.start_web_services()
cr = db.cursor()
logger = logging.getLogger('server')
logger.info('loading test file %s', test_file)
openerp.tools.convert_yaml_import(cr, 'base', file(test_file), {}, 'test', True)
cr.rollback()
cr.close()
def export_translation():
config = openerp.tools.config
dbname = config['db_name']
logger = logging.getLogger('server')
if config["language"]:
msg = "language %s" % (config["language"],)
else:
msg = "new language"
logger.info('writing translation file for %s to %s', msg,
config["translate_out"])
fileformat = os.path.splitext(config["translate_out"])[-1][1:].lower()
buf = file(config["translate_out"], "w")
cr = openerp.pooler.get_db(dbname).cursor()
openerp.tools.trans_export(config["language"],
config["translate_modules"] or ["all"], buf, fileformat, cr)
cr.close()
buf.close()
logger.info('translation file written successfully')
def import_translation():
config = openerp.tools.config
context = {'overwrite': config["overwrite_existing_translations"]}
dbname = config['db_name']
cr = openerp.pooler.get_db(dbname).cursor()
openerp.tools.trans_load( cr, config["translate_in"], config["language"],
context=context)
openerp.tools.trans_update_res_ids(cr)
cr.commit()
cr.close()
def start_services():
http_server = openerp.service.http_server
netrpc_server = openerp.service.netrpc_server
# Instantiate local services (this is a legacy design).
openerp.osv.osv.start_object_proxy()
# Export (for RPC) services.
openerp.service.web_services.start_web_services()
# Initialize the HTTP stack.
http_server.init_servers()
http_server.init_xmlrpc()
http_server.init_static_http()
netrpc_server.init_servers()
if config['db_name']:
for dbname in config['db_name'].split(','):
db, pool = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False)
cr = db.cursor()
# Start the main cron thread.
openerp.netsvc.start_agent()
if config["test_file"]:
logger.info('loading test file %s', config["test_file"])
openerp.tools.convert_yaml_import(cr, 'base', file(config["test_file"]), {}, 'test', True)
cr.rollback()
pool.get('ir.cron').restart(db.dbname)
cr.close()
#----------------------------------------------------------
# translation stuff
#----------------------------------------------------------
if config["translate_out"]:
if config["language"]:
msg = "language %s" % (config["language"],)
else:
msg = "new language"
logger.info('writing translation file for %s to %s', msg, config["translate_out"])
fileformat = os.path.splitext(config["translate_out"])[-1][1:].lower()
buf = file(config["translate_out"], "w")
dbname = config['db_name']
cr = openerp.pooler.get_db(dbname).cursor()
openerp.tools.trans_export(config["language"], config["translate_modules"] or ["all"], buf, fileformat, cr)
cr.close()
buf.close()
logger.info('translation file written successfully')
sys.exit(0)
if config["translate_in"]:
context = {'overwrite': config["overwrite_existing_translations"]}
dbname = config['db_name']
cr = openerp.pooler.get_db(dbname).cursor()
openerp.tools.trans_load(cr,
config["translate_in"],
config["language"],
context=context)
openerp.tools.trans_update_res_ids(cr)
cr.commit()
cr.close()
sys.exit(0)
#----------------------------------------------------------------------------------
# if we don't want the server to continue to run after initialization, we quit here
#----------------------------------------------------------------------------------
if config["stop_after_init"]:
sys.exit(0)
openerp.netsvc.start_agent()
#----------------------------------------------------------
# Launch Servers
#----------------------------------------------------------
LST_SIGNALS = ['SIGINT', 'SIGTERM']
SIGNALS = dict(
[(getattr(signal, sign), sign) for sign in LST_SIGNALS]
)
# Start the top-level servers threads (normally HTTP, HTTPS, and NETRPC).
openerp.netsvc.Server.startAll()
# Variable keeping track of the number of calls to the signal handler defined
# below. This variable is monitored by ``quit_on_signals()``.
quit_signals_received = 0
def handler(signum, frame):
"""
:param signum: the signal number
def signal_handler(sig, frame):
""" Signal handler: exit ungracefully on the second handled signal.
:param sig: the signal number
:param frame: the interrupted stack frame or None
"""
global quit_signals_received
quit_signals_received += 1
if quit_signals_received > 1:
# logging.shutdown was already called at this point.
sys.stderr.write("Forced shutdown.\n")
os._exit(0)
def dumpstacks(signum, frame):
def dumpstacks(sig, frame):
""" Signal handler: dump a stack trace for each existing thread."""
# code from http://stackoverflow.com/questions/132058/getting-stack-trace-from-a-running-python-application#answer-2569696
# modified for python 2.5 compatibility
thread_map = dict(threading._active, **threading._limbo)
@ -191,20 +189,33 @@ def dumpstacks(signum, frame):
code.append(" %s" % (line.strip()))
logging.getLogger('dumpstacks').info("\n".join(code))
for signum in SIGNALS:
signal.signal(signum, handler)
def setup_signal_handlers():
""" Register the signal handler defined above. """
SIGNALS = map(lambda x: getattr(signal, "SIG%s" % x), "INT TERM".split())
map(lambda sig: signal.signal(sig, signal_handler), SIGNALS)
if os.name == 'posix':
signal.signal(signal.SIGQUIT, dumpstacks)
if os.name == 'posix':
signal.signal(signal.SIGQUIT, dumpstacks)
def quit_on_signals():
""" Wait for one or two signals then shutdown the server.
The first SIGINT or SIGTERM signal will initiate a graceful shutdown while
a second one if any will force an immediate exit.
"""
# Wait for a first signal to be handled. (time.sleep will be interrupted
# by the signal handler.)
while quit_signals_received == 0:
time.sleep(60)
def quit():
openerp.netsvc.Agent.quit()
openerp.netsvc.Server.quitAll()
config = openerp.tools.config
if config['pidfile']:
os.unlink(config['pidfile'])
logger = logging.getLogger('shutdown')
logger.info("Initiating OpenERP Server shutdown")
logger.info("Hit CTRL-C again or send a second signal to immediately terminate the server...")
logger = logging.getLogger('server')
logger.info("Initiating shutdown")
logger.info("Hit CTRL-C again or send a second signal to force the shutdown.")
logging.shutdown()
# manually join() all threads before calling sys.exit() to allow a second signal
@ -219,19 +230,45 @@ def quit():
time.sleep(0.05)
sys.exit(0)
if config['pidfile']:
fd = open(config['pidfile'], 'w')
pidtext = "%d" % (os.getpid())
fd.write(pidtext)
fd.close()
if __name__ == "__main__":
openerp.netsvc.Server.startAll()
check_root_user()
openerp.tools.config.parse_config(sys.argv[1:])
check_postgres_user()
openerp.netsvc.init_logger()
report_configuration()
logger.info('OpenERP server is running, waiting for connections...')
config = openerp.tools.config
while quit_signals_received == 0:
time.sleep(60)
setup_signal_handlers()
quit()
if config["test_file"]:
run_test_file(config['db_name'], config['test_file'])
sys.exit(0)
if config["translate_out"]:
export_translation()
sys.exit(0)
if config["translate_in"]:
import_translation()
sys.exit(0)
if not config["stop_after_init"]:
# Some module register themselves when they are loaded so we need the
# services to be running before loading any registry.
start_services()
if config['db_name']:
for dbname in config['db_name'].split(','):
preload_registry(dbname)
if config["stop_after_init"]:
sys.exit(0)
setup_pid_file()
logger = logging.getLogger('server')
logger.info('OpenERP server is running, waiting for connections...')
quit_on_signals()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -59,18 +59,18 @@
'res/res_request_view.xml',
'res/res_lang_view.xml',
'res/res_log_view.xml',
'res/partner/partner_report.xml',
'res/partner/partner_view.xml',
'res/partner/partner_shortcut_data.xml',
'res/partner/bank_view.xml',
'res/country_view.xml',
'res/res_partner_report.xml',
'res/res_partner_view.xml',
'res/res_partner_shortcut_data.xml',
'res/res_bank_view.xml',
'res/res_country_view.xml',
'res/res_currency_view.xml',
'res/partner/crm_view.xml',
'res/partner/wizard/partner_sms_send_view.xml',
'res/partner/wizard/partner_wizard_spam_view.xml',
'res/partner/wizard/partner_clear_ids_view.xml',
'res/partner/wizard/partner_wizard_ean_check_view.xml',
'res/partner/partner_data.xml',
'res/res_partner_event_view.xml',
'res/wizard/partner_sms_send_view.xml',
'res/wizard/partner_wizard_massmail_view.xml',
'res/wizard/partner_clear_ids_view.xml',
'res/wizard/partner_wizard_ean_check_view.xml',
'res/res_partner_data.xml',
'res/ir_property_view.xml',
'security/base_security.xml',
'publisher_warranty/publisher_warranty_view.xml',
@ -81,8 +81,7 @@
],
'demo_xml': [
'base_demo.xml',
'res/partner/partner_demo.xml',
'res/partner/crm_demo.xml',
'res/res_partner_demo.xml',
'res/res_widget_demo.xml',
],
'test': [

View File

@ -1608,7 +1608,14 @@
<field name="rate">691.3153</field>
<field name="currency_id" ref="CRC"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
</record>
<record id="ir_mail_server_localhost0" model="ir.mail_server">
<field name="name">localhost</field>
<field name="smtp_host">localhost</field>
<field eval="25" name="smtp_port"/>
<field eval="10" name="priority"/>
</record>
<record id="MUR" model="res.currency">
<field name="name">MUR</field>

View File

@ -111,7 +111,8 @@
<group colspan="4" col="6">
<field name="name" select="1"/>
<field name="login" select="1"/>
<field name="new_password" password="True"/>
<field name="id" invisible="1"/>
<field name="new_password" password="True" attrs="{'required': [('id','=',False)]}"/>
<field name="active"/>
</group>
<notebook colspan="4">
@ -224,16 +225,18 @@
<field name="city"/>
<field name="country_id"/>
<field name="state_id"/>
<field name="phone" on_change="on_change_header(phone, email, fax, website, vat)"/>
<field name="email" on_change="on_change_header(phone, email, fax, website, vat)"/>
<field name="fax" on_change="on_change_header(phone, email, fax, website, vat)"/>
<field name="website" on_change="on_change_header(phone, email, fax, website, vat)"/>
<field name="vat" on_change="on_change_header(phone, email, fax, website, vat)"/>
<field name="phone"/>
<field name="email"/>
<field name="fax"/>
<field name="website"/>
<field name="vat"/>
<field name="company_registry"/>
<separator string="Header/Footer of Reports" colspan="4"/>
<group colspan="4" col="3">
<field name="rml_header1" colspan="3"/>
<newline/>
<field name="rml_footer1" colspan="3"/>
<field name="rml_footer1" colspan="2"/>
<button name="generate_header" string="Generate" type="object" icon="gtk-go-forward"/>
<newline/>
<field name="rml_footer2" colspan="2"/>
<button name="%(bank_account_update)d" string="Set Bank Accounts" type="action" icon="gtk-go-forward"/>
@ -242,10 +245,10 @@
<button name="%(preview_report)d" string="Preview Header" type="action" icon="gtk-print"/>
</group>
</page>
<page string="Header/Footer" groups="base.group_extended">
<page string="External Template" groups="base.group_extended">
<field colspan="4" name="rml_header" nolabel="1"/>
</page>
<page string="Internal Header/Footer" groups="base.group_extended">
<page string="Internal Template" groups="base.group_extended">
<separator string="Portrait" colspan="2"/>
<separator string="Landscape" colspan="2"/>
<field colspan="2" name="rml_header2" nolabel="1"/>

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:37+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:38+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:37+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:39+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:37+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:39+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:38+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:39+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:38+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:39+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:38+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:39+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: openobject-server\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-08-13 17:34+0000\n"
"Last-Translator: Chronos <robie@centrum.cz>\n"
"PO-Revision-Date: 2011-09-13 11:47+0000\n"
"Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:38+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-14 04:40+0000\n"
"X-Generator: Launchpad (build 13921)\n"
"X-Poedit-Language: Czech\n"
#. module: base
@ -120,6 +120,8 @@ msgid ""
"You can not write in this document (%s) ! Be sure your user belongs to one "
"of these groups: %s."
msgstr ""
"Nemůžete zapisovat do tohoto dokumentu (%s)! Ujistěte se, že váš uživatel "
"patří do některé z těchto skupin: %s."
#. module: base
#: help:ir.model.fields,domain:0
@ -128,6 +130,8 @@ msgid ""
"specified as a Python expression defining a list of triplets. For example: "
"[('color','=','red')]"
msgstr ""
"Volitelná doména k omezení možných hodnot pro pole, specifikovaná jako výraz "
"v Pythonu obsahující seznam trojic. Například: [('color','=','red')]"
#. module: base
#: field:res.partner,ref:0
@ -152,6 +156,9 @@ msgid ""
"Properties of base fields cannot be altered in this manner! Please modify "
"them through Python code, preferably through a custom addon!"
msgstr ""
"Vlastnosti základních polí (base fields) nemohou být takto měněny! "
"Modifikujte je pomocí kódu v Pythonu, nejlépe prostřednictvím vlastního add-"
"onu!"
#. module: base
#: code:addons/osv.py:133
@ -167,7 +174,7 @@ msgstr "ir.ui.view.custom"
#. module: base
#: model:res.country,name:base.sz
msgid "Swaziland"
msgstr "Švýcarsko"
msgstr "Svazijsko"
#. module: base
#: code:addons/orm.py:1993
@ -206,7 +213,7 @@ msgstr "Struktura společnosti"
#. module: base
#: selection:base.language.install,lang:0
msgid "Inuktitut / ᐃᓄᒃᑎᑐᑦ"
msgstr ""
msgstr "Inuktitut / ᐃᓄᒃᑎᑐᑦ"
#. module: base
#: view:res.partner:0
@ -395,6 +402,8 @@ msgid ""
"If you check this, then the second time the user prints with same attachment "
"name, it returns the previous report."
msgstr ""
"Pokud toto zaškrtnute, příště když uživatel bude tisknout přílohu se stejným "
"názvem, vrátí se mu předchozí report."
#. module: base
#: code:addons/orm.py:904
@ -405,7 +414,7 @@ msgstr "U tohoto objektu není vytvořena čtecí metoda."
#. module: base
#: help:res.lang,iso_code:0
msgid "This ISO code is the name of po files to use for translations"
msgstr ""
msgstr "ISO kód je název .po souborů použitých pro překlady"
#. module: base
#: view:base.module.upgrade:0
@ -445,6 +454,8 @@ msgid ""
"The ISO country code in two chars.\n"
"You can use this field for quick search."
msgstr ""
"ISO kód země - dvě písmena.\n"
"Toto pole můžete použít pro rychlé hledání."
#. module: base
#: model:res.country,name:base.pw
@ -466,6 +477,8 @@ msgstr "Nepřeložené"
msgid ""
"Context dictionary as Python expression, empty by default (Default: {})"
msgstr ""
"Kontextový slovník jako výraz Pythonu, výchozí hodnota je prázdný slovník "
"(výchozí: {})"
#. module: base
#: model:ir.actions.act_window,name:base.ir_action_wizard
@ -509,7 +522,7 @@ msgstr "Popis modelu"
#: help:ir.actions.act_window,src_model:0
msgid ""
"Optional model name of the objects on which this action should be visible"
msgstr ""
msgstr "Volitelné jméno modelu objektů, u kterých má tato akce být dostupná"
#. module: base
#: field:workflow.transition,trigger_expr_id:0
@ -591,7 +604,7 @@ msgstr "Zobrazení průvodce"
#. module: base
#: model:res.country,name:base.kh
msgid "Cambodia, Kingdom of"
msgstr ""
msgstr "Kambodžské království"
#. module: base
#: model:ir.actions.act_window,name:base.ir_sequence_form
@ -872,7 +885,7 @@ msgstr "Znak"
#: model:ir.actions.act_window,name:base.action_publisher_warranty_contract_form
#: model:ir.ui.menu,name:base.menu_publisher_warranty_contract
msgid "Contracts"
msgstr "Kontakty"
msgstr "Smlouvy"
#. module: base
#: selection:base.language.install,lang:0
@ -1863,7 +1876,7 @@ msgstr "Slovinsko"
#. module: base
#: model:res.country,name:base.pk
msgid "Pakistan"
msgstr "Pakistán"
msgstr "Pákistán"
#. module: base
#: code:addons/orm.py:1350
@ -3519,7 +3532,7 @@ msgstr "Pobřeží slonoviny (Cote D'Ivoire)"
#. module: base
#: model:res.country,name:base.kz
msgid "Kazakhstan"
msgstr "Kazakstán"
msgstr "Kazachstán"
#. module: base
#: view:res.lang:0
@ -3883,7 +3896,7 @@ msgstr "Měsíc"
#. module: base
#: model:res.country,name:base.my
msgid "Malaysia"
msgstr "Malaysie"
msgstr "Malajsie"
#. module: base
#: view:base.language.install:0
@ -3958,7 +3971,7 @@ msgstr "Neplatné ID pro záznam procházení, máme %r, očekáván integer."
#: model:ir.actions.act_window,name:base.action_partner_addess_tree
#: view:res.partner:0
msgid "Partner Contacts"
msgstr "Kontakty společníka"
msgstr "Kontakty partnera"
#. module: base
#: field:base.module.update,add:0
@ -4046,7 +4059,7 @@ msgstr "Pravidlo musí mít alespoň jedno aktivní přístupové právo !"
#. module: base
#: model:res.country,name:base.fj
msgid "Fiji"
msgstr "Fiji"
msgstr "Fii"
#. module: base
#: field:ir.model.fields,size:0
@ -4056,7 +4069,7 @@ msgstr "Velikost"
#. module: base
#: model:res.country,name:base.sd
msgid "Sudan"
msgstr "Sudan"
msgstr "Súdán"
#. module: base
#: model:res.country,name:base.fm
@ -4105,7 +4118,7 @@ msgstr "Formát času"
#. module: base
#: view:ir.module.module:0
msgid "Defined Reports"
msgstr "Definoavné výkazy"
msgstr "Definované výkazy"
#. module: base
#: view:ir.actions.report.xml:0
@ -4604,7 +4617,7 @@ msgstr "Přístup k nabídce"
#. module: base
#: model:res.country,name:base.na
msgid "Namibia"
msgstr "Nambie"
msgstr "Namibie"
#. module: base
#: model:res.country,name:base.mn
@ -4787,7 +4800,7 @@ msgstr "Adresy"
#. module: base
#: model:res.country,name:base.mm
msgid "Myanmar"
msgstr "Barma"
msgstr "Myanmar"
#. module: base
#: selection:base.language.install,lang:0
@ -5463,12 +5476,12 @@ msgstr "Globální"
#. module: base
#: model:res.country,name:base.mp
msgid "Northern Mariana Islands"
msgstr "Severní Mariánské ostrovy"
msgstr "Severní Mariany"
#. module: base
#: model:res.country,name:base.sb
msgid "Solomon Islands"
msgstr "Šalamounovy Ostrovy"
msgstr "Šalamounovy ostrovy"
#. module: base
#: code:addons/base/ir/ir_model.py:490
@ -5669,7 +5682,7 @@ msgstr "Jazyk"
#. module: base
#: model:res.country,name:base.gm
msgid "Gambia"
msgstr "Gambia"
msgstr "Gambie"
#. module: base
#: model:ir.actions.act_window,name:base.action_res_company_form
@ -6430,7 +6443,7 @@ msgstr "Mongolština / монгол"
#. module: base
#: model:res.country,name:base.mr
msgid "Mauritania"
msgstr "Mauretánie"
msgstr "Mauritánie"
#. module: base
#: model:ir.model,name:base.model_ir_translation
@ -7366,7 +7379,7 @@ msgstr "Typ výkazu"
#: field:workflow.instance,state:0
#: field:workflow.workitem,state:0
msgid "State"
msgstr "Stát"
msgstr "Stav"
#. module: base
#: selection:base.language.install,lang:0
@ -7636,7 +7649,7 @@ msgstr "Změnit heslo"
#. module: base
#: model:res.country,name:base.nl
msgid "Netherlands"
msgstr "Nizozemí"
msgstr "Nizozemsko"
#. module: base
#: model:ir.ui.menu,name:base.next_id_4
@ -8124,7 +8137,7 @@ msgstr "Asociace"
#. module: base
#: model:res.country,name:base.cl
msgid "Chile"
msgstr "Čile"
msgstr "Chile"
#. module: base
#: model:ir.ui.menu,name:base.menu_address_book
@ -8172,7 +8185,7 @@ msgstr "Popisek pole"
#. module: base
#: model:res.country,name:base.dj
msgid "Djibouti"
msgstr "Djibouti"
msgstr "Džibutsko"
#. module: base
#: field:ir.translation,value:0
@ -8351,7 +8364,7 @@ msgstr "Chyba"
#. module: base
#: model:res.country,name:base.pm
msgid "Saint Pierre and Miquelon"
msgstr "Saint Pierre a Miquelon"
msgstr "Svatý Pierre a Miquelon"
#. module: base
#: help:ir.actions.report.xml,header:0
@ -8527,7 +8540,7 @@ msgstr ""
#. module: base
#: model:res.country,name:base.sa
msgid "Saudi Arabia"
msgstr "Saudská Arábie"
msgstr "Saúdská Arábie"
#. module: base
#: help:res.partner,supplier:0
@ -8624,7 +8637,7 @@ msgstr ""
#. module: base
#: model:res.country,name:base.sv
msgid "El Salvador"
msgstr "El Salvador"
msgstr "Salvador"
#. module: base
#: field:res.bank,phone:0
@ -8924,7 +8937,7 @@ msgstr "Pracovní postup, který má být spuštěn pro tento model."
#. module: base
#: model:res.country,name:base.jm
msgid "Jamaica"
msgstr "Jamaika"
msgstr "Jamajka"
#. module: base
#: model:ir.actions.act_window,help:base.action_partner_category_form

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:38+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:40+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -15,8 +15,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:39+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:40+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -12,8 +12,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:39+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:41+0000\n"
"X-Generator: Launchpad (build 13827)\n"
"X-Poedit-Country: GREECE\n"
"X-Poedit-Language: Greek\n"
"X-Poedit-SourceCharset: utf-8\n"

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:43+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:44+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:42+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:43+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:43+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0
@ -1238,7 +1238,7 @@ msgstr "Información asistente"
#: model:ir.actions.act_window,name:base.action_wizard_lang_export
#: model:ir.ui.menu,name:base.menu_wizard_lang_export
msgid "Export Translation"
msgstr "Traducción de exportación"
msgstr "Exportar Traducción"
#. module: base
#: help:res.log,secondary:0
@ -3373,7 +3373,7 @@ msgstr "Ucraniano / українська"
#: model:ir.actions.act_window,name:base.action_translation
#: model:ir.ui.menu,name:base.menu_action_translation
msgid "Translation Terms"
msgstr "Condiciones de Traducción"
msgstr "Términos de Traducción"
#. module: base
#: model:res.country,name:base.sn
@ -3728,7 +3728,7 @@ msgstr ""
#. module: base
#: model:ir.ui.menu,name:base.menu_translation_app
msgid "Application Terms"
msgstr "Condiciones de aplicación"
msgstr "Términos de aplicación"
#. module: base
#: help:res.config.users,context_tz:0

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:38+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:40+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:37+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:39+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -9,8 +9,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:41+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:42+0000\n"
"X-Generator: Launchpad (build 13827)\n"
"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
"X-Poedit-Language: Persian\n"

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:39+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:40+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:39+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:40+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:39+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:41+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:39+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:41+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:42+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:43+0000\n"
"X-Generator: Launchpad (build 13827)\n"
"Language: hr\n"
#. module: base

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:39+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:41+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:37+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:39+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:40+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:41+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:39+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:41+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:40+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:41+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:40+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:41+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:40+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:42+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:40+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:42+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:40+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:42+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:40+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:42+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:40+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:42+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:41+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:42+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0
@ -1190,7 +1190,7 @@ msgstr "Navn på stat"
#. module: base
#: selection:ir.property,type:0
msgid "Float"
msgstr ""
msgstr "Flyttall"
#. module: base
#: model:ir.model,name:base.model_res_request_link
@ -1561,6 +1561,8 @@ msgid ""
"Example: GLOBAL_RULE_1 AND GLOBAL_RULE_2 AND ( (GROUP_A_RULE_1 AND "
"GROUP_A_RULE_2) OR (GROUP_B_RULE_1 AND GROUP_B_RULE_2) )"
msgstr ""
"Eksempel: GLOBAL_RULE_1 AND GLOBAL_RULE_2 AND ( (GROUP_A_RULE_1 AND "
"GROUP_A_RULE_2) OR (GROUP_B_RULE_1 AND GROUP_B_RULE_2) )"
#. module: base
#: model:ir.actions.act_window,help:base.action_ui_view
@ -3155,7 +3157,7 @@ msgstr ""
#. module: base
#: view:base.module.configuration:0
msgid "System Configuration Done"
msgstr ""
msgstr "Systemkonfigurasjon fullført"
#. module: base
#: code:addons/orm.py:929
@ -3631,7 +3633,7 @@ msgstr "Britisk Engelsk"
#. module: base
#: selection:base.language.install,lang:0
msgid "Japanese / 日本語"
msgstr ""
msgstr "Japansk / 日本語"
#. module: base
#: help:workflow.transition,act_from:0
@ -3670,7 +3672,7 @@ msgstr ""
#. module: base
#: model:ir.model,name:base.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr ""
msgstr "publisher_warranty.contract"
#. module: base
#: model:res.country,name:base.et
@ -4194,7 +4196,7 @@ msgstr "United Kingdom"
#: view:res.config.users:0
#: view:res.config.view:0
msgid "res_config_contents"
msgstr ""
msgstr "res_config_contents"
#. module: base
#: help:res.partner.category,active:0
@ -4378,7 +4380,7 @@ msgstr "Stat (USA)"
#. module: base
#: field:ir.actions.server,copy_object:0
msgid "Copy Of"
msgstr ""
msgstr "Kopi av"
#. module: base
#: field:ir.model,osv_memory:0
@ -4487,7 +4489,7 @@ msgstr ""
#: code:addons/base/module/module.py:198
#, python-format
msgid "The name of the module must be unique !"
msgstr ""
msgstr "Modulnavnet må være unikt!"
#. module: base
#: model:res.country,name:base.mz
@ -4497,7 +4499,7 @@ msgstr "Mosambik"
#. module: base
#: model:ir.ui.menu,name:base.menu_project_long_term
msgid "Long Term Planning"
msgstr ""
msgstr "Langtidsplanlegging"
#. module: base
#: field:ir.actions.server,message:0
@ -4657,7 +4659,7 @@ msgstr "Spanish (MX) / Español (MX)"
#. module: base
#: view:res.log:0
msgid "My Logs"
msgstr ""
msgstr "Mine logger"
#. module: base
#: model:res.country,name:base.bt
@ -4667,7 +4669,7 @@ msgstr "Bhutan"
#. module: base
#: help:ir.sequence,number_next:0
msgid "Next number of this sequence"
msgstr ""
msgstr "Neste nummer på denne sekvensen"
#. module: base
#: model:res.partner.category,name:base.res_partner_category_11
@ -4804,7 +4806,7 @@ msgstr "Myanmar"
#. module: base
#: selection:base.language.install,lang:0
msgid "Chinese (CN) / 简体中文"
msgstr ""
msgstr "Kinesisk (CN) / 简体中文"
#. module: base
#: field:res.bank,street:0
@ -5304,12 +5306,12 @@ msgstr ""
#: code:addons/orm.py:158
#, python-format
msgid "Object %s does not exists"
msgstr ""
msgstr "Object %s finnes ikke"
#. module: base
#: selection:base.language.install,lang:0
msgid "Slovenian / slovenščina"
msgstr ""
msgstr "Slovensk / slovenščina"
#. module: base
#: field:ir.actions.report.xml,attachment_use:0
@ -5565,7 +5567,7 @@ msgstr "Veiledning"
#. module: base
#: view:ir.ui.view:0
msgid "Architecture"
msgstr ""
msgstr "Arkitektur"
#. module: base
#: model:res.country,name:base.ml
@ -5585,7 +5587,7 @@ msgstr ""
#. module: base
#: selection:base.language.install,lang:0
msgid "Flemish (BE) / Vlaams (BE)"
msgstr ""
msgstr "Flamsk (BE) / Vlaams (BE)"
#. module: base
#: field:ir.cron,interval_number:0
@ -5650,7 +5652,7 @@ msgstr "Tilpassede snarveier"
#. module: base
#: selection:base.language.install,lang:0
msgid "Vietnamese / Tiếng Việt"
msgstr ""
msgstr "Vietnamesisk / Tiếng Việt"
#. module: base
#: model:res.country,name:base.dz
@ -5665,7 +5667,7 @@ msgstr "Belgia"
#. module: base
#: model:ir.model,name:base.model_osv_memory_autovacuum
msgid "osv_memory.autovacuum"
msgstr ""
msgstr "osv_memory.autovacuum"
#. module: base
#: field:base.language.export,lang:0
@ -5703,19 +5705,19 @@ msgstr "%H - Time (24-times klokke) [00,23]."
#. module: base
#: model:ir.model,name:base.model_res_widget
msgid "res.widget"
msgstr ""
msgstr "res.widget"
#. module: base
#: code:addons/base/ir/ir_model.py:258
#, python-format
msgid "Model %s does not exist!"
msgstr ""
msgstr "Model %s finnes ikke!"
#. module: base
#: code:addons/base/res/res_lang.py:159
#, python-format
msgid "You cannot delete the language which is User's Preferred Language !"
msgstr ""
msgstr "Du kan ikke slette et språk som benyttes av en bruker !"
#. module: base
#: code:addons/fields.py:103
@ -6168,7 +6170,7 @@ msgstr ""
#. module: base
#: selection:base.language.install,lang:0
msgid "Chinese (TW) / 正體字"
msgstr ""
msgstr "Kinesisk (TW) / 正體字"
#. module: base
#: model:ir.model,name:base.model_res_request
@ -6183,7 +6185,7 @@ msgstr ""
#. module: base
#: view:ir.actions.todo:0
msgid "Todo"
msgstr ""
msgstr "Gjøremål"
#. module: base
#: field:ir.attachment,datas:0
@ -6220,7 +6222,7 @@ msgstr "Gibraltar"
#. module: base
#: field:ir.actions.report.xml,report_name:0
msgid "Service Name"
msgstr ""
msgstr "Tjenestenavn"
#. module: base
#: model:res.country,name:base.pn
@ -6282,7 +6284,7 @@ msgstr ""
#. module: base
#: sql_constraint:res.lang:0
msgid "The code of the language must be unique !"
msgstr ""
msgstr "Språkkoden må være unik !"
#. module: base
#: model:ir.actions.act_window,name:base.action_attachment
@ -6349,7 +6351,7 @@ msgstr "Italia"
#: view:ir.actions.todo:0
#: selection:ir.actions.todo,state:0
msgid "To Do"
msgstr ""
msgstr "Gjøremål"
#. module: base
#: selection:base.language.install,lang:0
@ -6376,7 +6378,7 @@ msgstr "Python handlinger"
#. module: base
#: selection:base.language.install,lang:0
msgid "English (US)"
msgstr ""
msgstr "Engelsk (US)"
#. module: base
#: model:ir.actions.act_window,name:base.action_model_data
@ -6450,7 +6452,7 @@ msgstr "Aktivitet"
#: view:res.partner:0
#: view:res.partner.address:0
msgid "Postal Address"
msgstr ""
msgstr "Postadresse"
#. module: base
#: field:res.company,parent_id:0

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:38+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:40+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:43+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:41+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:42+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:41+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:43+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0
@ -580,7 +580,7 @@ msgstr ""
#. module: base
#: field:res.partner,title:0
msgid "Partner Form"
msgstr "Formulário de Parceiros"
msgstr "Tipo de Organização"
#. module: base
#: selection:base.language.install,lang:0
@ -618,7 +618,7 @@ msgstr "Importar idioma"
#. module: base
#: model:ir.model,name:base.model_res_config_users
msgid "res.config.users"
msgstr ""
msgstr "res.config.users"
#. module: base
#: selection:base.language.install,lang:0

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:43+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:44+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:41+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:43+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:41+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:43+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0
@ -6839,7 +6839,7 @@ msgstr "Управление банковскими документами ис
#. module: base
#: view:base.module.import:0
msgid "Import module"
msgstr "Модуль импорта"
msgstr "Импорт модуля"
#. module: base
#: field:ir.actions.server,loop_action:0

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:42+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:43+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:42+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:43+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:37+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:39+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:41+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:43+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:42+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:43+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:42+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:44+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:42+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:44+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:42+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:44+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:42+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:44+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:43+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:44+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:43+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:44+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:43+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0
@ -33,7 +33,7 @@ msgstr "圣赫勒拿"
#. module: base
#: view:ir.actions.report.xml:0
msgid "Other Configuration"
msgstr "其他配置"
msgstr "其它设置"
#. module: base
#: selection:ir.property,type:0
@ -296,7 +296,7 @@ msgstr "源对象"
#. module: base
#: view:ir.actions.todo:0
msgid "Config Wizard Steps"
msgstr "置向导步骤"
msgstr "置向导步骤"
#. module: base
#: model:ir.model,name:base.model_ir_ui_view_sc
@ -806,7 +806,7 @@ msgstr "关岛(美属)"
#. module: base
#: model:ir.ui.menu,name:base.menu_hr_project
msgid "Human Resources Dashboard"
msgstr "人事管理仪表盘"
msgstr "人力资源控制台"
#. module: base
#: code:addons/base/res/res_user.py:507
@ -840,7 +840,7 @@ msgstr "韩国"
#: model:ir.ui.menu,name:base.menu_workflow_transition
#: view:workflow.activity:0
msgid "Transitions"
msgstr "转"
msgstr "转"
#. module: base
#: code:addons/orm.py:4020
@ -996,7 +996,7 @@ msgstr "请求日期"
#. module: base
#: model:ir.ui.menu,name:base.menu_hr_dasboard
msgid "Dashboard"
msgstr "仪表盘"
msgstr "控制台"
#. module: base
#: model:ir.ui.menu,name:base.menu_purchase_root
@ -1041,7 +1041,7 @@ msgstr "不存在代码为“%s”的语言"
#: code:addons/base/publisher_warranty/publisher_warranty.py:163
#, python-format
msgid "Error during communication with the publisher warranty server."
msgstr "当与发布者保障服务器通信时发生错误。"
msgstr "当与保障服务器通信时发生错误。"
#. module: base
#: help:ir.actions.server,email:0
@ -1996,7 +1996,7 @@ msgstr "亚美尼亚"
#: model:ir.actions.act_window,name:base.ir_property_form
#: model:ir.ui.menu,name:base.menu_ir_property_form_all
msgid "Configuration Parameters"
msgstr "置参数"
msgstr "置参数"
#. module: base
#: constraint:ir.cron:0
@ -2046,7 +2046,7 @@ msgstr "图像"
#. module: base
#: view:ir.actions.server:0
msgid "Iteration Action Configuration"
msgstr "重复活动置"
msgstr "重复活动置"
#. module: base
#: selection:publisher_warranty.contract,state:0
@ -2262,7 +2262,7 @@ msgstr "ID参照"
#: model:ir.actions.server,name:base.action_start_configurator
#: model:ir.ui.menu,name:base.menu_view_base_module_configuration
msgid "Start Configuration"
msgstr "开始置"
msgstr "开始置"
#. module: base
#: model:res.country,name:base.mt
@ -2961,8 +2961,7 @@ msgid ""
"\n"
"Click 'Continue' and enjoy your OpenERP experience..."
msgstr ""
"您的帐套已经全部配置完毕。\n"
"\n"
"您的帐套已经全部设置完毕。\n"
"请单击“继续”按钮开始享受您的 OpenERP 体验..."
#. module: base
@ -3103,7 +3102,7 @@ msgstr "Abkhazian / аҧсуа"
#. module: base
#: view:base.module.configuration:0
msgid "System Configuration Done"
msgstr "系统置完成"
msgstr "系统置完成"
#. module: base
#: code:addons/orm.py:929
@ -3372,7 +3371,7 @@ msgstr ""
#: view:res.request:0
#: field:res.request,history:0
msgid "History"
msgstr "历史记录"
msgstr "日志"
#. module: base
#: field:ir.attachment,create_uid:0
@ -3430,7 +3429,7 @@ msgstr "一般说明"
#: model:ir.actions.act_window,name:base.action_config_simple_view_form
#: view:res.config.view:0
msgid "Configure Your Interface"
msgstr "置你的界面"
msgstr "置你的界面"
#. module: base
#: field:ir.values,meta:0
@ -3647,7 +3646,7 @@ msgstr "ir.actions.wizard"
#: view:ir.filters:0
#: view:res.request:0
msgid "Group By"
msgstr "分组方式"
msgstr "分组"
#. module: base
#: view:res.config:0
@ -3903,7 +3902,7 @@ msgstr "ir.actions.url"
#. module: base
#: model:res.widget,title:base.currency_converter_widget
msgid "Currency Converter"
msgstr "货币转换器"
msgstr "币别兑换"
#. module: base
#: code:addons/orm.py:156
@ -4113,7 +4112,7 @@ msgstr "未读"
#. module: base
#: field:ir.cron,doall:0
msgid "Repeat Missed"
msgstr "重复错过的"
msgstr "重做错过的动作"
#. module: base
#: help:ir.actions.server,state:0
@ -4129,7 +4128,7 @@ msgstr "对象映射"
#: help:res.currency,rate:0
#: help:res.currency.rate,rate:0
msgid "The rate of the currency to the currency of rate 1"
msgstr "货币到货币的转换汇率为 1"
msgstr "币别到其他币别的汇率为 1"
#. module: base
#: model:res.country,name:base.uk
@ -4203,7 +4202,7 @@ msgstr "ir.attachment"
msgid ""
"You cannot perform this operation. New Record Creation is not allowed for "
"this object as this object is for reporting purpose."
msgstr "您不能支持此操作。此对象不允许进行“创建新记录”操作,因为此对象是为报表准备的。"
msgstr "您不能执行此操作。此对象不允许进行“创建新记录”操作,因为此对象是为报告准备的。"
#. module: base
#: view:base.language.import:0
@ -4507,7 +4506,9 @@ msgid ""
"The configuration wizards are used to help you configure a new instance of "
"OpenERP. They are launched during the installation of new modules, but you "
"can choose to restart some wizards manually from this menu."
msgstr "配置向导将帮助您配置一个新的 OpenERP 实例。向导将在安装新模块的时候启动,但是您也可以在此菜单中手工重新启动一些向导。"
msgstr ""
"设置向导将帮助您设置一个新的 OpenERP 实例。\r\n"
"向导将在安装新模块的时候启动,但是您也可以在此菜单中手工重新启动一些向导。"
#. module: base
#: code:addons/base/res/res_user.py:206
@ -4625,7 +4626,7 @@ msgstr "此窗口"
#. module: base
#: view:publisher_warranty.contract:0
msgid "Publisher Warranty Contracts"
msgstr "发布者担保合约"
msgstr "担保合约"
#. module: base
#: help:res.log,name:0
@ -5152,7 +5153,7 @@ msgstr "多米尼加"
#: sql_constraint:publisher_warranty.contract:0
msgid ""
"Your publisher warranty contract is already subscribed in the system !"
msgstr "您的发布者保障合约已经在系统中订阅。"
msgstr "您的保障合约已经在系统中订阅。"
#. module: base
#: help:ir.cron,nextcall:0
@ -5525,7 +5526,7 @@ msgid ""
msgstr ""
"如果用户已提供电子邮件,将发送欢迎邮件给他们.\\n\n"
"\\n\n"
"警告:如果“email_from”和“smtp_server”SMTP没有置,将无法发送邮件给新用户。"
"警告:如果“email_from”和“smtp_server”SMTP没有置,将无法发送邮件给新用户。"
#. module: base
#: selection:base.language.install,lang:0
@ -5803,7 +5804,7 @@ msgstr "视图类型设为“tree”来使用树形控件显示层次数据
#: code:addons/base/res/res_config.py:421
#, python-format
msgid "Click 'Continue' to configure the next addon..."
msgstr "请单击“继续”按钮置下一个模块..."
msgstr "请单击“继续”按钮置下一个模块..."
#. module: base
#: field:ir.actions.server,record_id:0
@ -5873,7 +5874,7 @@ msgstr "字段描述"
#: view:res.partner.address:0
#: view:workflow.activity:0
msgid "Group By..."
msgstr "分组"
msgstr "分组..."
#. module: base
#: view:ir.model.fields:0
@ -6008,7 +6009,7 @@ msgstr "Spanish (CO) / Español (CO)"
msgid ""
"All pending configuration wizards have been executed. You may restart "
"individual wizards via the list of configuration wizards."
msgstr "所有挂起的配置向导已被执行,您可以通过配置向导列表重启单个向导。"
msgstr "所有挂起的设置向导已被执行,您可以通过设置向导列表重启单个向导。"
#. module: base
#: wizard_button:server.action.create,step_1,create:0
@ -6441,14 +6442,14 @@ msgid ""
"No rate found \n"
"for the currency: %s \n"
"at the date: %s"
msgstr "找不到货币 %s 日期 %s 的比率。"
msgstr "找不到币别 %s 日期 %s 的汇率。"
#. module: base
#: model:ir.actions.act_window,help:base.action_ui_view_custom
msgid ""
"Customized views are used when users reorganize the content of their "
"dashboard views (via web client)"
msgstr "自定义视图用于用户重新组织他们的仪表盘视图内容(经由 Web 客户端)"
msgstr "自定义视图用于用户重新组织他们的控制台视图内容(通过 Web 客户端)"
#. module: base
#: field:ir.model,name:0
@ -6634,7 +6635,7 @@ msgstr ""
#: model:ir.ui.menu,name:base.next_id_73
#: model:ir.ui.menu,name:base.reporting_menu
msgid "Reporting"
msgstr "报"
msgstr "报"
#. module: base
#: model:res.country,name:base.tg
@ -6718,7 +6719,7 @@ msgstr "州/省名称"
#. module: base
#: field:workflow.activity,join_mode:0
msgid "Join Mode"
msgstr "合模式"
msgstr "合模式"
#. module: base
#: field:res.config.users,context_tz:0
@ -6760,7 +6761,7 @@ msgstr "OpenERP 业务伙伴"
#. module: base
#: model:ir.ui.menu,name:base.menu_hr_manager
msgid "HR Manager Dashboard"
msgstr "人事经理仪表盘"
msgstr "人力资源经理控制台"
#. module: base
#: code:addons/base/module/module.py:253
@ -7539,7 +7540,7 @@ msgstr "爱沙尼亚"
#. module: base
#: model:ir.ui.menu,name:base.dashboard
msgid "Dashboards"
msgstr "仪表盘"
msgstr "控制台"
#. module: base
#: help:ir.attachment,type:0
@ -7736,7 +7737,7 @@ msgstr "标识此对象模型是否仅存于内存,比如一个不需要持久
#: field:res.partner,child_ids:0
#: field:res.request,ref_partner_id:0
msgid "Partner Ref."
msgstr "业务伙伴参照"
msgstr "业务伙伴"
#. module: base
#: model:ir.actions.act_window,name:base.action_partner_supplier_form
@ -7753,12 +7754,12 @@ msgstr "注册"
#. module: base
#: field:res.request,ref_doc2:0
msgid "Document Ref 2"
msgstr "单据参照2"
msgstr "单据2"
#. module: base
#: field:res.request,ref_doc1:0
msgid "Document Ref 1"
msgstr "单据参照1"
msgstr "单据1"
#. module: base
#: model:res.country,name:base.ga
@ -7921,7 +7922,7 @@ msgstr "保加利亚"
#. module: base
#: view:publisher_warranty.contract.wizard:0
msgid "Publisher warranty contract successfully registered!"
msgstr "发布者保障合同注册成功!"
msgstr "保障合同注册成功!"
#. module: base
#: model:res.country,name:base.ao
@ -7941,7 +7942,7 @@ msgstr "法属南部领土"
#: field:res.currency,name:0
#: field:res.currency.rate,currency_id:0
msgid "Currency"
msgstr "币"
msgstr "币"
#. module: base
#: field:res.partner.canal,name:0
@ -8468,7 +8469,7 @@ msgstr "事件日志"
#: code:addons/base/module/wizard/base_module_configuration.py:37
#, python-format
msgid "System Configuration done"
msgstr "系统置已完成"
msgstr "系统置已完成"
#. module: base
#: field:workflow.triggers,instance_id:0
@ -8536,7 +8537,7 @@ msgstr "3. 如果用户属于多个组那么第2步的结果将使用“或
#: code:addons/base/publisher_warranty/publisher_warranty.py:145
#, python-format
msgid "Please check your publisher warranty contract name and validity."
msgstr "请检查您的发布者保障合同名称和有效性。"
msgstr "请检查您的保障合同名称和有效性。"
#. module: base
#: model:res.country,name:base.sv
@ -8634,7 +8635,7 @@ msgstr "台湾"
#. module: base
#: model:ir.model,name:base.model_res_currency_rate
msgid "Currency Rate"
msgstr "兑换率"
msgstr "率"
#. module: base
#: model:ir.actions.act_window,help:base.grant_menu_access
@ -8807,7 +8808,7 @@ msgstr "电子邮件与签名"
#. module: base
#: view:publisher_warranty.contract:0
msgid "Publisher Warranty Contract"
msgstr "发布者保障合同"
msgstr "保障合同"
#. module: base
#: selection:base.language.install,lang:0
@ -9070,7 +9071,7 @@ msgstr "地区代码"
#. module: base
#: field:workflow.activity,split_mode:0
msgid "Split Mode"
msgstr "分模式"
msgstr "分模式"
#. module: base
#: view:base.module.upgrade:0
@ -9218,7 +9219,7 @@ msgstr "下一序号将以此数增加."
#: field:res.partner.address,function:0
#: selection:workflow.activity,kind:0
msgid "Function"
msgstr "能"
msgstr "能"
#. module: base
#: view:res.widget:0

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-14 04:43+0000\n"
"X-Generator: Launchpad (build 13674)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n"
"X-Generator: Launchpad (build 13827)\n"
#. module: base
#: view:ir.filters:0

View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@ -15,7 +15,7 @@
# 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/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@ -37,5 +37,7 @@ import wizard
import ir_config_parameter
import osv_memory_autovacuum
import ir_edi
import ir_mail_server
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -28,7 +28,7 @@
<group col="2" colspan="2">
<separator string="Values for Event Type" colspan="2"/>
<label string="client_action_multi, client_action_relate" colspan="2"/>
<label string="tree_but_action, client_print_multi" colspan="2"/>
<label string="tree_but_open, client_print_multi" colspan="2"/>
</group>
<group col="2" colspan="2">
<separator colspan="2" string="Value"/>
@ -241,7 +241,7 @@
<field name="view_id" ref="sequence_view_tree"/>
<field name="context">{'active_test': False}</field>
</record>
<menuitem id="next_id_5" name="Sequences" parent="base.menu_config"/>
<menuitem id="next_id_5" name="Sequences &amp; Identifiers" parent="base.menu_config"/>
<menuitem action="ir_sequence_form" id="menu_ir_sequence_form" parent="next_id_5"/>
<!-- Sequences Types -->
@ -535,6 +535,7 @@
<field name="type" readonly="1"/>
<field name="src_model" select="2"/>
<field name="usage"/>
<field name="target"/>
</group>
<notebook colspan="4">
<page string="General Settings">
@ -1220,7 +1221,7 @@
<field name="model">ir.model.data</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Object Identifiers">
<form string="External Identifiers">
<field name="name"/>
<field name="module"/>
<field name="model"/>
@ -1238,7 +1239,7 @@
<field name="model">ir.model.data</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Object Identifiers">
<tree string="External Identifiers">
<field name="module"/>
<field name="name"/>
<field name="model"/>
@ -1252,7 +1253,7 @@
<field name="model">ir.model.data</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Object Identifiers">
<search string="External Identifiers">
<filter icon="terp-camera_test"
string="Updatable"
domain="[('noupdate', '=', False)]"/>
@ -1292,7 +1293,7 @@
<menuitem action="action_model_fields" id="ir_model_model_fields" parent="base.next_id_9"/>
<record id="action_model_data" model="ir.actions.act_window">
<field name="name">Object Identifiers</field>
<field name="name">External Identifiers</field>
<field name="res_model">ir.model.data</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_model_data_list"/>
@ -1994,5 +1995,76 @@
<field name="sequence">5</field>
</record>
<!-- ir.mail.server -->
<record model="ir.ui.view" id="ir_mail_server_form">
<field name="name">ir.mail.server.form</field>
<field name="model">ir.mail_server</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Outgoing Mail Servers">
<group colspan="4">
<field name="name"/>
<field name="sequence"/>
</group>
<notebook colspan="4">
<page string="Configuration">
<group col="2" colspan="4">
<separator string="Connection Information" colspan="4"/>
<field name="smtp_host"/>
<field name="smtp_port"/>
<field name="smtp_debug"/>
</group>
<group col="2" colspan="4">
<separator string="Security and Authentication" colspan="2"/>
<field name="smtp_encryption" on_change="on_change_encryption(smtp_encryption)"/>
<field name="smtp_user"/>
<field name="smtp_pass" password="True"/>
<button name="test_smtp_connection" type="object" string="Test Connection" icon="gtk-network" colspan="2"/>
</group>
</page>
</notebook>
</form>
</field>
</record>
<record model="ir.ui.view" id="ir_mail_server_list">
<field name="name">ir.mail.server.list</field>
<field name="model">ir.mail_server</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Outgoing Mail Servers">
<field name="sequence"/>
<field name="name"/>
<field name="smtp_host"/>
<field name="smtp_user"/>
<field name="smtp_encryption"/>
</tree>
</field>
</record>
<record id="view_ir_mail_server_search" model="ir.ui.view">
<field name="name">ir.mail.server.search</field>
<field name="model">ir.mail_server</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Outgoing Mail Servers">
<field name="name"/>
<field name="smtp_host"/>
<field name="smtp_user"/>
<field name="smtp_encryption"/>
</search>
</field>
</record>
<record model="ir.actions.act_window" id="action_ir_mail_server_list">
<field name="name">Outgoing Mail Servers</field>
<field name="res_model">ir.mail_server</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="ir_mail_server_list" />
<field name="search_view_id" ref="view_ir_mail_server_search"/>
</record>
<menuitem id="next_id_15" name="Parameters" parent="base.menu_config" groups="base.group_extended" />
<menuitem id="menu_mail_servers" parent="base.next_id_15" action="action_ir_mail_server_list" sequence="15"/>
</data>
</openerp>

Some files were not shown because too many files have changed in this diff Show More