[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20110901130339-0epw03nlkwo29125
This commit is contained in:
Vo Minh Thu 2011-09-01 15:03:39 +02:00
commit efd281a21f
150 changed files with 822 additions and 838 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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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 sutdown.")
logging.shutdown()
# manually join() all threads before calling sys.exit() to allow a second signal
@ -219,19 +230,40 @@ 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)
if config["test_file"]:
run_test_file(config['db_name'], config['test_file'])
sys.exit(0)
quit()
if config["translate_out"]:
export_translation()
sys.exit(0)
if config["translate_in"]:
import_translation()
sys.exit(0)
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()
setup_signal_handlers()
start_services()
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_spam_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

@ -224,16 +224,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 +244,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-23 04:57+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 04:57+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 04:57+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 04:58+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 04:58+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 04:58+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 04:58+0000\n"
"X-Generator: Launchpad (build 13697)\n"
"X-Launchpad-Export-Date: 2011-09-01 04:40+0000\n"
"X-Generator: Launchpad (build 13827)\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
@ -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

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-23 04:58+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 04:59+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 04:59+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:03+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:02+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:03+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:03+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 04:58+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 04:57+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:00+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 04:58+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 04:58+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 04:59+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 04:59+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:01+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 04:59+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 04:57+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 04:59+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 04:59+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 04:59+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 04:59+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:00+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:00+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:00+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:00+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:00+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:00+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 04:58+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:03+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:00+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:01+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:03+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:01+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:01+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:02+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:02+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 04:57+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:01+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:02+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:02+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:02+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:02+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:02+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:03+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:03+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:03+0000\n"
"X-Generator: Launchpad (build 13697)\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-23 05:03+0000\n"
"X-Generator: Launchpad (build 13697)\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

@ -936,10 +936,9 @@ class act_client(osv.osv):
for record in self.browse(cr, uid, ids, context=context)
])
def _set_params(self, cr, uid, ids, field_name, field_value, arg, context):
def _set_params(self, cr, uid, id, field_name, field_value, arg, context):
assert isinstance(field_value, dict), "params can only be dictionaries"
for record in self.browse(cr, uid, ids, context=context):
record.write({field_name: repr(field_value)})
self.write(cr, uid, id, {'params_store': repr(field_value)}, context=context)
_columns = {
'tag': fields.char('Client action tag', size=64, required=True,

View File

@ -33,7 +33,6 @@ class ir_attachment(osv.osv):
"""
if not ids:
return
ima = self.pool.get('ir.model.access')
res_ids = {}
if ids:
if isinstance(ids, (int, long)):
@ -47,12 +46,13 @@ class ir_attachment(osv.osv):
if 'res_model' in values and 'res_id' in values:
res_ids.setdefault(values['res_model'],set()).add(values['res_id'])
ima = self.pool.get('ir.model.access')
for model, mids in res_ids.items():
# ignore attachments that are not attached to a resource anymore when checking access rights
# (resource was deleted but attachment was not)
cr.execute('select id from '+self.pool.get(model)._table+' where id in %s', (tuple(mids),))
mids = [x[0] for x in cr.fetchall()]
ima.check(cr, uid, model, mode, context=context)
ima.check(cr, uid, model, mode)
self.pool.get(model).check_access_rule(cr, uid, mids, mode, context=context)
def search(self, cr, uid, args, offset=0, limit=None, order=None,
@ -80,7 +80,7 @@ class ir_attachment(osv.osv):
# performed in batch as much as possible.
ima = self.pool.get('ir.model.access')
for model, targets in model_attachments.iteritems():
if not ima.check(cr, uid, model, 'read', raise_exception=False, context=context):
if not ima.check(cr, uid, model, 'read', False):
# remove all corresponding attachment ids
for attach_id in itertools.chain(*targets.values()):
ids.remove(attach_id)

View File

@ -466,6 +466,7 @@ class ir_model_access(osv.osv):
a.perm_''' + access_mode, (model_name,))
return [x[0] for x in cr.fetchall()]
@tools.ormcache()
def check(self, cr, uid, model, mode='read', raise_exception=True, context=None):
if uid==1:
# User root have all accesses
@ -520,8 +521,6 @@ class ir_model_access(osv.osv):
raise except_orm(_('AccessError'), msgs[mode] % (model_name, groups) )
return r
check = tools.cache()(check)
__cache_clearing_methods = []
def register_cache_clearing_method(self, model, method):
@ -535,7 +534,7 @@ class ir_model_access(osv.osv):
pass
def call_cache_clearing_methods(self, cr):
self.check.clear_cache(cr.dbname) # clear the cache of check function
self.check.clear_cache(self) # clear the cache of check function
for model, method in self.__cache_clearing_methods:
object_ = self.pool.get(model)
if object_:
@ -599,7 +598,7 @@ class ir_model_data(osv.osv):
if not cr.fetchone():
cr.execute('CREATE INDEX ir_model_data_module_name_index ON ir_model_data (module, name)')
@tools.cache()
@tools.ormcache()
def _get_id(self, cr, uid, module, xml_id):
"""Returns the id of the ir.model.data record corresponding to a given module and xml_id (cached) or raise a ValueError if not found"""
ids = self.search(cr, uid, [('module','=',module), ('name','=', xml_id)])
@ -608,7 +607,7 @@ class ir_model_data(osv.osv):
# the sql constraints ensure us we have only one result
return ids[0]
@tools.cache()
@tools.ormcache()
def get_object_reference(self, cr, uid, module, xml_id):
"""Returns (model, res_id) corresponding to a given module and xml_id (cached) or raise ValueError if not found"""
data_id = self._get_id(cr, uid, module, xml_id)
@ -637,10 +636,8 @@ class ir_model_data(osv.osv):
def unlink(self, cr, uid, ids, context=None):
""" Regular unlink method, but make sure to clear the caches. """
ref_ids = self.browse(cr, uid, ids, context=context)
for ref_id in ref_ids:
self._get_id.clear_cache(cr.dbname, uid, ref_id.module, ref_id.name)
self.get_object_reference.clear_cache(cr.dbname, uid, ref_id.module, ref_id.name)
self._get_id.clear_cache(self)
self.get_object_reference.clear_cache(self)
return super(ir_model_data,self).unlink(cr, uid, ids, context=context)
def _update(self,cr, uid, model, module, values, xml_id=False, store=True, noupdate=False, mode='init', res_id=False, context=None):
@ -666,8 +663,8 @@ class ir_model_data(osv.osv):
results = cr.fetchall()
for imd_id2,res_id2,real_id2 in results:
if not real_id2:
self._get_id.clear_cache(cr.dbname, uid, module, xml_id)
self.get_object_reference.clear_cache(cr.dbname, uid, module, xml_id)
self._get_id.clear_cache(self, uid, module, xml_id)
self.get_object_reference.clear_cache(self, uid, module, xml_id)
cr.execute('delete from ir_model_data where id=%s', (imd_id2,))
res_id = False
else:

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