From 4910de7f3c6a6f8fd8c53906b367168223de733b Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Mon, 16 Jan 2012 15:55:24 +0100 Subject: [PATCH 01/19] [FIX] NameError in jsonp POST. bzr revid: florent.xicluna@gmail.com-20120116145524-razqfr39bf4b4t9v --- addons/web/common/http.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/web/common/http.py b/addons/web/common/http.py index 681a38384a2..3e6ee257ea3 100644 --- a/addons/web/common/http.py +++ b/addons/web/common/http.py @@ -146,7 +146,8 @@ class JsonRequest(WebRequest): if jsonp and self.httprequest.method == 'POST': # jsonp 2 steps step1 POST: save call self.init(args) - req.session.jsonp_requests[args.get('id')] = self.httprequest.form['r'] + request_id = args.get('id') + self.session.jsonp_requests[request_id] = self.httprequest.form['r'] headers=[('Content-Type', 'text/plain; charset=utf-8')] r = werkzeug.wrappers.Response(request_id, headers=headers) return r From d0eb54d4c4f4502e6c920d16f0d48b0467120b22 Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Wed, 18 Jan 2012 20:04:09 +0100 Subject: [PATCH 02/19] =?UTF-8?q?[FIX]=C2=A0a=20typo=20between=20'id'=20an?= =?UTF-8?q?d=20builtin=20.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bzr revid: florent.xicluna@gmail.com-20120118190409-ddg3bbvb7r9jzyjc --- addons/web/common/http.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/web/common/http.py b/addons/web/common/http.py index 3e6ee257ea3..50a6b43e909 100644 --- a/addons/web/common/http.py +++ b/addons/web/common/http.py @@ -142,11 +142,11 @@ class JsonRequest(WebRequest): jsonp = args.get('jsonp') requestf = None request = None + request_id = args.get('id') if jsonp and self.httprequest.method == 'POST': # jsonp 2 steps step1 POST: save call self.init(args) - request_id = args.get('id') self.session.jsonp_requests[request_id] = self.httprequest.form['r'] headers=[('Content-Type', 'text/plain; charset=utf-8')] r = werkzeug.wrappers.Response(request_id, headers=headers) @@ -154,10 +154,10 @@ class JsonRequest(WebRequest): elif jsonp and args.get('r'): # jsonp method GET request = args.get('r') - elif jsonp and args.get('id'): + elif jsonp and request_id: # jsonp 2 steps step2 GET: run and return result self.init(args) - request = self.session.jsonp_requests.pop(args.get(id), "") + request = self.session.jsonp_requests.pop(request_id, "") else: # regular jsonrpc2 requestf = self.httprequest.stream From 766c664d6da325c1a1428991eba3221dd1d9cd8f Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 19 Jan 2012 12:46:14 +0100 Subject: [PATCH 03/19] [FIX] extend revid:fme@openerp.com-20120117124417-k3vdiktc93gl99fi to all instances of Firefox bug randomly happens on FF 9.0.1/OSX as well bzr revid: xmo@openerp.com-20120119114614-6br6qj4byhy0ct1a --- addons/web/static/src/js/view_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 1892c4c085d..17e46f6085c 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -792,7 +792,7 @@ openerp.web.form.Widget = openerp.web.Widget.extend(/** @lends openerp.web.form. return QWeb.render(template, { "widget": this }); }, do_attach_tooltip: function(widget, trigger, options) { - if ($.browser.mozilla && parseInt($.browser.version.split('.')[0], 10) < 2) { + if ($.browser.mozilla) { // Unknown bug in old version of firefox : // input type=text onchange event not fired when tootip is shown return; From c078d23d16c1baaddfc72bbf9fa12b823fbd0c00 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Thu, 19 Jan 2012 15:30:57 +0100 Subject: [PATCH 04/19] [FIX] avoid blank page when the database assigned to the session has been removed bzr revid: chs@openerp.com-20120119143057-pbqdh15jptyc7y0a --- addons/web/common/session.py | 7 +++++++ addons/web/controllers/main.py | 1 + 2 files changed, 8 insertions(+) diff --git a/addons/web/common/session.py b/addons/web/common/session.py index ca23a08da4a..24564ba7bf8 100644 --- a/addons/web/common/session.py +++ b/addons/web/common/session.py @@ -80,6 +80,13 @@ class OpenERPSession(object): """ self.build_connection().check_login(force) + def ensure_valid(self): + if self._uid: + try: + self.assert_valid(True) + except Exception: + self._uid = None + def execute(self, model, func, *l, **d): self.assert_valid() model = self.build_connection().get_model(model) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index d578025b3b5..bb08393cae3 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -360,6 +360,7 @@ class Session(openerpweb.Controller): _cp_path = "/web/session" def session_info(self, req): + req.session.ensure_valid() return { "session_id": req.session_id, "uid": req.session._uid, From f9cbad5bf6ea947c66d6057d44bf31f42577bd44 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 19 Jan 2012 15:48:37 +0100 Subject: [PATCH 05/19] [FIX] correctly display crash manager in case of report error lp bug: https://launchpad.net/bugs/917227 fixed bzr revid: xmo@openerp.com-20120119144837-dp6r7vqx581b4mrt --- addons/web/common/http.py | 26 +++++++++++++++++++++++++- addons/web/controllers/main.py | 21 +++++++++------------ addons/web/static/src/js/chrome.js | 11 ++++------- addons/web/static/src/js/core.js | 11 +++++++++-- addons/web/static/src/js/views.js | 3 ++- 5 files changed, 49 insertions(+), 23 deletions(-) diff --git a/addons/web/common/http.py b/addons/web/common/http.py index 931b2181d15..ac9b95dcb26 100644 --- a/addons/web/common/http.py +++ b/addons/web/common/http.py @@ -3,6 +3,7 @@ # OpenERP Web HTTP layer #---------------------------------------------------------- import ast +import cgi import contextlib import functools import logging @@ -254,7 +255,30 @@ class HttpRequest(WebRequest): else: akw[key] = type(value) _logger.debug("%s --> %s.%s %r", self.httprequest.method, controller.__class__.__name__, method.__name__, akw) - r = method(controller, self, **self.params) + try: + r = method(controller, self, **self.params) + except xmlrpclib.Fault, e: + r = werkzeug.exceptions.InternalServerError(cgi.escape(simplejson.dumps({ + 'code': 200, + 'message': "OpenERP Server Error", + 'data': { + 'type': 'server_exception', + 'fault_code': e.faultCode, + 'debug': "Server %s\nClient %s" % ( + e.faultString, traceback.format_exc()) + } + }))) + except Exception: + logging.getLogger(__name__ + '.HttpRequest.dispatch').exception( + "An error occurred while handling a json request") + r = werkzeug.exceptions.InternalServerError(cgi.escape(simplejson.dumps({ + 'code': 300, + 'message': "OpenERP WebClient Error", + 'data': { + 'type': 'client_exception', + 'debug': "Client %s" % traceback.format_exc() + } + }))) if self.debug or 1: if isinstance(r, (werkzeug.wrappers.BaseResponse, werkzeug.exceptions.HTTPException)): _logger.debug('<-- %s', r) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index bb08393cae3..0878ec09725 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -6,6 +6,7 @@ import csv import glob import itertools import operator +import traceback import os import re import simplejson @@ -17,6 +18,7 @@ from xml.etree import ElementTree from cStringIO import StringIO import babel.messages.pofile +import werkzeug.exceptions import werkzeug.utils try: import xlwt @@ -321,18 +323,13 @@ class Database(openerpweb.Controller): @openerpweb.httprequest def backup(self, req, backup_db, backup_pwd, token): - try: - db_dump = base64.b64decode( - req.session.proxy("db").dump(backup_pwd, backup_db)) - return req.make_response(db_dump, - [('Content-Type', 'application/octet-stream; charset=binary'), - ('Content-Disposition', 'attachment; filename="' + backup_db + '.dump"')], - {'fileToken': int(token)} - ) - except xmlrpclib.Fault, e: - if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': - return 'Backup Database|' + e.faultCode - return 'Backup Database|Could not generate database backup' + db_dump = base64.b64decode( + req.session.proxy("db").dump(backup_pwd, backup_db)) + return req.make_response(db_dump, + [('Content-Type', 'application/octet-stream; charset=binary'), + ('Content-Disposition', 'attachment; filename="' + backup_db + '.dump"')], + {'fileToken': int(token)} + ) @openerpweb.httprequest def restore(self, req, db_file, restore_pwd, new_db): diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 6a9e860aadc..06fcf518002 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -472,16 +472,13 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database self.blockUI(); self.session.get_file({ form: form, - error: function (body) { - var error = body.firstChild.data.split('|'); - self.display_error({ - title: error[0], - error: error[1] - }); + success: function () { + self.do_notify(_t("Backed"), + _t("Database backed up successfully")); }, + error: openerp.webclient.crashmanager.on_rpc_error, complete: function() { self.unblockUI(); - self.do_notify(_t("Backed"), _t("Database backed up successfully")); } }); } diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index 3005fc80d13..43bd8a0abf7 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -809,8 +809,15 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp. .attr({id: id, name: id}) .appendTo(document.body) .load(function () { - if (options.error) { options.error(this.contentDocument.body); } - complete(); + try { + if (options.error) { + options.error(JSON.parse( + this.contentDocument.body.childNodes[1].textContent + )); + } + } finally { + complete(); + } }); if (options.form) { diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 4853eebfab6..1aa76b9a6dd 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -195,7 +195,8 @@ session.web.ActionManager = session.web.Widget.extend({ on_closed(); } self.dialog_stop(); - } + }, + error: session.webclient.crashmanager.on_rpc_error }) }); }, From c68045e4972a60305f8187477255adee47e8a0a2 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 19 Jan 2012 16:10:12 +0100 Subject: [PATCH 06/19] [FIX] expression: properly care for implicitly defined m2m fields used in search() domains Now that m2m fields may be defined without explicitly specifying the name of the relationship table and its foreign key columns, all access to these internal names should be done via m2m._sql_names(). This seems better than lazily initializing these internal names and hoping that nothing accesses them before the init. bzr revid: odo@openerp.com-20120119151012-c38k5zl7rqherhth --- openerp/osv/expression.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/openerp/osv/expression.py b/openerp/osv/expression.py index c81ee897891..9da51ce744c 100644 --- a/openerp/osv/expression.py +++ b/openerp/osv/expression.py @@ -526,12 +526,13 @@ class expression(object): self.__exp[i] = ('id', o2m_op, select_distinct_from_where_not_null(cr, field._fields_id, field_obj._table)) elif field._type == 'many2many': + rel_table, rel_id1, rel_id2 = field._sql_names(working_table) #FIXME if operator == 'child_of': def _rec_convert(ids): if field_obj == table: return ids - return select_from_where(cr, field._id1, field._rel, field._id2, ids, operator) + return select_from_where(cr, rel_id1, rel_table, rel_id2, ids, operator) ids2 = to_ids(right, field_obj) dom = child_of_domain('id', ids2, field_obj) @@ -559,11 +560,11 @@ class expression(object): else: call_null_m2m = False m2m_op = 'not in' if operator in NEGATIVE_TERM_OPERATORS else 'in' - self.__exp[i] = ('id', m2m_op, select_from_where(cr, field._id1, field._rel, field._id2, res_ids, operator) or [0]) + self.__exp[i] = ('id', m2m_op, select_from_where(cr, rel_id1, rel_table, rel_id2, res_ids, operator) or [0]) if call_null_m2m: m2m_op = 'in' if operator in NEGATIVE_TERM_OPERATORS else 'not in' - self.__exp[i] = ('id', m2m_op, select_distinct_from_where_not_null(cr, field._id1, field._rel)) + self.__exp[i] = ('id', m2m_op, select_distinct_from_where_not_null(cr, rel_id1, rel_table)) elif field._type == 'many2one': if operator == 'child_of': From ccde5e2f5ea41e023db7a281b5d357999e85a749 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 19 Jan 2012 16:54:25 +0100 Subject: [PATCH 07/19] [REM] unused imports mistakenly added in revision xmo@openerp.com-20120119144837-dp6r7vqx581b4mrt bzr revid: xmo@openerp.com-20120119155425-kud19lwt56du1ym9 --- addons/web/controllers/main.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 0878ec09725..261d77caa24 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -6,7 +6,6 @@ import csv import glob import itertools import operator -import traceback import os import re import simplejson @@ -18,7 +17,6 @@ from xml.etree import ElementTree from cStringIO import StringIO import babel.messages.pofile -import werkzeug.exceptions import werkzeug.utils try: import xlwt From abdd7ee80aa0ccefaec034839fbef11eea52bedb Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Fri, 20 Jan 2012 05:05:47 +0000 Subject: [PATCH 08/19] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20120120043919-2ocn475pp0mg6lxi bzr revid: launchpad_translations_on_behalf_of_openerp-20120120050547-7tx0jp1f156n2hxu --- addons/account/i18n/pt_BR.po | 4 +- addons/base_iban/i18n/nl.po | 16 ++- addons/base_module_record/i18n/nl.po | 11 +- addons/base_report_creator/i18n/nl.po | 10 +- addons/base_setup/i18n/nl.po | 10 +- addons/base_synchro/i18n/nl.po | 10 +- addons/crm/i18n/nl.po | 187 +++++++++++++------------- addons/web/po/zh_CN.po | 41 +++--- addons/web_dashboard/po/zh_CN.po | 10 +- addons/web_diagram/po/zh_CN.po | 10 +- addons/web_graph/po/zh_CN.po | 10 +- 11 files changed, 169 insertions(+), 150 deletions(-) diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po index 25eac0d0d03..f76912f089e 100644 --- a/addons/account/i18n/pt_BR.po +++ b/addons/account/i18n/pt_BR.po @@ -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: 2012-01-19 04:50+0000\n" -"X-Generator: Launchpad (build 14692)\n" +"X-Launchpad-Export-Date: 2012-01-20 04:39+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: account #: view:account.invoice.report:0 diff --git a/addons/base_iban/i18n/nl.po b/addons/base_iban/i18n/nl.po index 9e84cb89990..4c8e477c5bc 100644 --- a/addons/base_iban/i18n/nl.po +++ b/addons/base_iban/i18n/nl.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-13 05:55+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) \n" +"PO-Revision-Date: 2012-01-19 19:18+0000\n" +"Last-Translator: Erwin \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-12-23 05:50+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-20 04:38+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: base_iban #: constraint:res.partner.bank:0 @@ -27,12 +27,12 @@ msgstr "" #. module: base_iban #: model:res.partner.bank.type,format_layout:base_iban.bank_iban msgid "%(bank_name)s: IBAN %(acc_number)s - BIC %(bank_bic)s" -msgstr "" +msgstr "%(bank_name)s: IBAN %(acc_number)s - BIC %(bank_bic)s" #. module: base_iban #: model:res.partner.bank.type.field,name:base_iban.bank_swift_field msgid "bank_bic" -msgstr "" +msgstr "bank_bic" #. module: base_iban #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field @@ -61,6 +61,8 @@ msgid "" "The IBAN does not seem to be correct. You should have entered something like " "this %s" msgstr "" +"De IBAN lijkt niet juist te zijn. U zou iets moeten ingeven in de trant van " +"%s" #. module: base_iban #: field:res.partner.bank,iban:0 @@ -71,7 +73,7 @@ msgstr "IBAN" #: code:addons/base_iban/base_iban.py:131 #, python-format msgid "The IBAN is invalid, it should begin with the country code" -msgstr "" +msgstr "De IBAN is ongeldig. Het zou moeten beginnen met de landcode" #. module: base_iban #: model:res.partner.bank.type,name:base_iban.bank_iban diff --git a/addons/base_module_record/i18n/nl.po b/addons/base_module_record/i18n/nl.po index 93422baa080..b2d1881dfda 100644 --- a/addons/base_module_record/i18n/nl.po +++ b/addons/base_module_record/i18n/nl.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-13 13:42+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) \n" +"PO-Revision-Date: 2012-01-19 18:41+0000\n" +"Last-Translator: Erwin \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-12-23 06:02+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-20 04:38+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: base_module_record #: wizard_field:base_module_record.module_record_objects,info,category:0 @@ -89,6 +89,9 @@ msgid "" "publish it on http://www.openerp.com, in the 'Modules' section. You can do " "it through the website or using features of the 'base_module_publish' module." msgstr "" +"Als u denkt dat uw module interessant is voor andere mensen, pupliceeer het " +"dan graag op http://www.openerp.com, in de module sectie. Het kan via de " +"website of via de mogelijkheden van de 'base_module_publish' module." #. module: base_module_record #: wizard_field:base_module_record.module_record_data,init,check_date:0 diff --git a/addons/base_report_creator/i18n/nl.po b/addons/base_report_creator/i18n/nl.po index 46dda98d849..85b277771c9 100644 --- a/addons/base_report_creator/i18n/nl.po +++ b/addons/base_report_creator/i18n/nl.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-12 16:35+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2012-01-19 18:42+0000\n" +"Last-Translator: Erwin \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-12-23 07:02+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-20 04:39+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: base_report_creator #: help:base_report_creator.report.filter,expression:0 @@ -438,6 +438,8 @@ msgstr "Naam overzicht" #: constraint:base_report_creator.report:0 msgid "You can not display field which are not stored in database." msgstr "" +"Het is niet mogelijk om een veld weer te geven wat niet is opgeslagen in de " +"database." #. module: base_report_creator #: view:base_report_creator.report:0 diff --git a/addons/base_setup/i18n/nl.po b/addons/base_setup/i18n/nl.po index f128faeeb54..3406ec819ce 100644 --- a/addons/base_setup/i18n/nl.po +++ b/addons/base_setup/i18n/nl.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2012-01-18 20:23+0000\n" -"Last-Translator: Erwin (Endian Solutions) \n" +"PO-Revision-Date: 2012-01-19 19:15+0000\n" +"Last-Translator: Erwin \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: 2012-01-19 04:50+0000\n" -"X-Generator: Launchpad (build 14692)\n" +"X-Launchpad-Export-Date: 2012-01-20 04:38+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: base_setup #: field:user.preferences.config,menu_tips:0 @@ -94,7 +94,7 @@ msgstr "Uitgebreid" #. module: base_setup #: selection:base.setup.terminology,partner:0 msgid "Patient" -msgstr "" +msgstr "Geduld" #. module: base_setup #: model:ir.actions.act_window,help:base_setup.action_import_create_installer diff --git a/addons/base_synchro/i18n/nl.po b/addons/base_synchro/i18n/nl.po index 433300304e4..05c0dd1cebe 100644 --- a/addons/base_synchro/i18n/nl.po +++ b/addons/base_synchro/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-12 18:49+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2012-01-19 18:42+0000\n" +"Last-Translator: Erwin \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:24+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-20 04:39+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: base_synchro #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro @@ -90,7 +90,7 @@ msgstr "Object" #. module: base_synchro #: view:base.synchro:0 msgid "Synchronization Completed!" -msgstr "" +msgstr "Synchronisatie compleet!" #. module: base_synchro #: field:base.synchro.server,login:0 diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po index f61805e6936..da7f4d82d59 100644 --- a/addons/crm/i18n/nl.po +++ b/addons/crm/i18n/nl.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:43+0000\n" -"PO-Revision-Date: 2012-01-15 12:41+0000\n" -"Last-Translator: Erwin (Endian Solutions) \n" +"PO-Revision-Date: 2012-01-19 19:14+0000\n" +"Last-Translator: Erwin \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: 2012-01-16 05:18+0000\n" -"X-Generator: Launchpad (build 14664)\n" +"X-Launchpad-Export-Date: 2012-01-20 04:38+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: crm #: view:crm.lead.report:0 @@ -138,7 +138,7 @@ msgstr "De lead '%s' is gesloten." #. module: crm #: view:crm.lead.report:0 msgid "Exp. Closing" -msgstr "" +msgstr "Ver. Besluit" #. module: crm #: selection:crm.meeting,rrule_type:0 @@ -173,17 +173,17 @@ msgstr "Campagne" #. module: crm #: view:crm.lead:0 msgid "Search Opportunities" -msgstr "Zoek kansen" +msgstr "Zoek prospects" #. module: crm #: help:crm.lead.report,deadline_month:0 msgid "Expected closing month" -msgstr "" +msgstr "Verwachte besluit maand" #. module: crm #: view:crm.lead2opportunity.partner.mass:0 msgid "Assigned opportunities to" -msgstr "" +msgstr "Prospects toegewezen aan" #. module: crm #: view:crm.lead:0 @@ -464,7 +464,7 @@ msgstr "Categorie" #. module: crm #: view:crm.lead:0 msgid "Opportunity / Customer" -msgstr "" +msgstr "Prospect / Klant" #. module: crm #: view:crm.lead.report:0 @@ -510,7 +510,7 @@ msgstr "Gewoon of telefonisch verkoopgesprek" #. module: crm #: view:crm.case.section:0 msgid "Mail Gateway" -msgstr "" +msgstr "Mail Gateway" #. module: crm #: model:process.node,note:crm.process_node_leads0 @@ -549,7 +549,7 @@ msgstr "Mailings" #. module: crm #: view:crm.phonecall:0 msgid "To Do" -msgstr "" +msgstr "Te doen" #. module: crm #: selection:crm.lead.report,creation_month:0 @@ -622,7 +622,7 @@ msgstr "" #. module: crm #: field:crm.lead,partner_address_name:0 msgid "Partner Contact Name" -msgstr "" +msgstr "Relatie contactnaam" #. module: crm #: selection:crm.meeting,end_type:0 @@ -669,7 +669,7 @@ msgstr "De afspraak '%s' is bevestigd." #: selection:crm.add.note,state:0 #: selection:crm.lead,state:0 msgid "In Progress" -msgstr "" +msgstr "In behandeling" #. module: crm #: help:crm.case.section,reply_to:0 @@ -683,7 +683,7 @@ msgstr "" #. module: crm #: field:crm.lead.report,creation_month:0 msgid "Creation Month" -msgstr "" +msgstr "Aanmaak maand" #. module: crm #: field:crm.case.section,resource_calendar_id:0 @@ -740,7 +740,7 @@ msgstr "" #. module: crm #: field:crm.lead2opportunity.partner.mass,user_ids:0 msgid "Salesmans" -msgstr "" +msgstr "Verkoper" #. module: crm #: field:crm.lead.report,probable_revenue:0 @@ -750,7 +750,7 @@ msgstr "Verwachte omzet" #. module: crm #: help:crm.lead.report,creation_month:0 msgid "Creation month" -msgstr "" +msgstr "Aanmaak maand" #. module: crm #: help:crm.segmentation,name:0 @@ -766,7 +766,7 @@ msgstr "Slagingskans" #. module: crm #: field:crm.lead,company_currency:0 msgid "Company Currency" -msgstr "" +msgstr "Bedrijfsvaluta" #. module: crm #: view:crm.lead:0 @@ -797,7 +797,7 @@ msgstr "Verkoopkans" #. module: crm #: view:crm.lead.report:0 msgid "Leads/Opportunities created in last month" -msgstr "" +msgstr "Leads/Prospects aangemakat in de laatste maand" #. module: crm #: model:crm.case.resource.type,name:crm.type_lead7 @@ -813,7 +813,7 @@ msgstr "Stop proces" #: view:crm.lead.report:0 #: view:crm.phonecall.report:0 msgid "Month-1" -msgstr "" +msgstr "Maand-1" #. module: crm #: view:crm.phonecall:0 @@ -856,12 +856,12 @@ msgstr "Exclusief" #: code:addons/crm/crm_lead.py:451 #, python-format msgid "From %s : %s" -msgstr "" +msgstr "Van %s : %s" #. module: crm #: field:crm.lead.report,creation_year:0 msgid "Creation Year" -msgstr "" +msgstr "Aanmaak jaar" #. module: crm #: field:crm.lead.report,create_date:0 @@ -882,7 +882,7 @@ msgstr "Verkoop Inkoop" #. module: crm #: help:crm.case.section,resource_calendar_id:0 msgid "Used to compute open days" -msgstr "" +msgstr "Gebruikt om open dagen te berekenen" #. module: crm #: view:crm.lead:0 @@ -917,7 +917,7 @@ msgstr "Terugkerende afspraak" #. module: crm #: view:crm.phonecall:0 msgid "Unassigned Phonecalls" -msgstr "" +msgstr "Niet toegewezen telefoongesprekken" #. module: crm #: view:crm.lead:0 @@ -981,7 +981,7 @@ msgstr "Waarschuwing!" #. module: crm #: view:crm.phonecall.report:0 msgid "Phone calls made in current year" -msgstr "" +msgstr "Telefoongesprekken gemaakt in huidige jaar" #. module: crm #: field:crm.lead,day_open:0 @@ -1022,7 +1022,7 @@ msgstr "Mijn afspraken" #. module: crm #: view:crm.phonecall:0 msgid "Todays's Phonecalls" -msgstr "" +msgstr "Telefoongesprekken van vandaag" #. module: crm #: view:board.board:0 @@ -1084,7 +1084,7 @@ msgstr "" #. module: crm #: view:crm.lead:0 msgid "Change Color" -msgstr "" +msgstr "Wijzig kleur" #. module: crm #: view:crm.segmentation:0 @@ -1102,7 +1102,7 @@ msgstr "Verantwoordelijke" #. module: crm #: view:crm.lead.report:0 msgid "Show only opportunity" -msgstr "" +msgstr "Toon alleen prospects" #. module: crm #: view:res.partner:0 @@ -1112,7 +1112,7 @@ msgstr "Vorige" #. module: crm #: view:crm.lead:0 msgid "New Leads" -msgstr "" +msgstr "Nieuwe leads" #. module: crm #: view:crm.lead:0 @@ -1127,12 +1127,12 @@ msgstr "Van" #. module: crm #: view:crm.lead2opportunity.partner.mass:0 msgid "Convert into Opportunities" -msgstr "" +msgstr "Converteer in rospects" #. module: crm #: view:crm.lead:0 msgid "Show Sales Team" -msgstr "" +msgstr "Toon verkoper" #. module: crm #: view:res.partner:0 @@ -1195,7 +1195,7 @@ msgstr "Aanmaakdatum" #. module: crm #: view:board.board:0 msgid "My Opportunities" -msgstr "" +msgstr "Mijn prospects" #. module: crm #: model:crm.case.categ,name:crm.categ_oppor5 @@ -1205,7 +1205,7 @@ msgstr "Heeft website ontwerp nodig" #. module: crm #: view:crm.phonecall.report:0 msgid "Year of call" -msgstr "" +msgstr "Jaaar van telefoongesprek" #. module: crm #: field:crm.meeting,recurrent_uid:0 @@ -1247,7 +1247,7 @@ msgstr "Mail naar relatie" #: view:crm.opportunity2phonecall:0 #: view:crm.phonecall2phonecall:0 msgid "Call Details" -msgstr "" +msgstr "Telefoongesprek details" #. module: crm #: field:crm.meeting,class:0 @@ -1258,7 +1258,7 @@ msgstr "Markeren als" #: view:crm.opportunity2phonecall:0 #: view:crm.phonecall2phonecall:0 msgid "Log call" -msgstr "" +msgstr "Log telefoongesprek" #. module: crm #: help:crm.meeting,rrule_type:0 @@ -1341,7 +1341,7 @@ msgstr "Duur in minuten" #. module: crm #: field:crm.case.channel,name:0 msgid "Channel Name" -msgstr "" +msgstr "Kanaalnaam" #. module: crm #: field:crm.partner2opportunity,name:0 @@ -1352,7 +1352,7 @@ msgstr "Naam verkoopkans" #. module: crm #: help:crm.lead.report,deadline_day:0 msgid "Expected closing day" -msgstr "" +msgstr "Verwachte besluit datun" #. module: crm #: help:crm.case.section,active:0 @@ -1418,7 +1418,7 @@ msgstr "Stel het alarm in op een tijd voorafgaand aan de gebeurtenis" #. module: crm #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner msgid "Schedule a Call" -msgstr "" +msgstr "Plan een telefoongesprek in" #. module: crm #: view:crm.lead2partner:0 @@ -1492,7 +1492,7 @@ msgstr "Uitgebreide filters..." #. module: crm #: view:crm.phonecall.report:0 msgid "Phone calls which are in closed state" -msgstr "" +msgstr "Telefoongesprekken welke in de afgesloten status zijn" #. module: crm #: view:crm.phonecall.report:0 @@ -1507,13 +1507,15 @@ msgstr "Prospects per categorie" #. module: crm #: view:crm.phonecall.report:0 msgid "Date of call" -msgstr "" +msgstr "Datun van telefoongesprek" #. module: crm #: help:crm.lead,section_id:0 msgid "" "When sending mails, the default email address is taken from the sales team." msgstr "" +"Wanneer een e-mail, wordt verstuurd, wordt het standaard adres van het " +"verkoopteam gebruikt." #. module: crm #: view:crm.meeting:0 @@ -1535,12 +1537,12 @@ msgstr "Plan een afspraak" #: code:addons/crm/crm_lead.py:431 #, python-format msgid "Merged opportunities" -msgstr "" +msgstr "Samengevoegde prospects" #. module: crm #: model:ir.actions.act_window,name:crm.crm_case_section_view_form_installer msgid "Define Sales Team" -msgstr "" +msgstr "Definieer het verkoopteam" #. module: crm #: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act @@ -1621,12 +1623,12 @@ msgstr "" #. module: crm #: field:crm.phonecall,opportunity_id:0 msgid "Lead/Opportunity" -msgstr "" +msgstr "Lead/Prospect" #. module: crm #: view:crm.lead:0 msgid "Mail" -msgstr "" +msgstr "Mail" #. module: crm #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action @@ -1641,7 +1643,7 @@ msgstr "" #. module: crm #: model:ir.actions.act_window,name:crm.act_oppor_categ msgid "Opportunities By Categories" -msgstr "" +msgstr "Prospects op categorie" #. module: crm #: help:crm.lead,partner_name:0 @@ -1659,13 +1661,13 @@ msgstr "Fout ! U kunt geen recursief verkoopteam maken." #: selection:crm.opportunity2phonecall,action:0 #: selection:crm.phonecall2phonecall,action:0 msgid "Log a call" -msgstr "" +msgstr "Log een telefoongesprek" #. module: crm #: selection:crm.lead2opportunity.partner,action:0 #: selection:crm.lead2opportunity.partner.mass,action:0 msgid "Do not link to a partner" -msgstr "" +msgstr "Koppel niet aan een partner" #. module: crm #: view:crm.meeting:0 @@ -1729,7 +1731,7 @@ msgstr "" #. module: crm #: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert msgid "Convert opportunities" -msgstr "" +msgstr "Converteer prospects" #. module: crm #: view:crm.lead.report:0 @@ -1769,7 +1771,7 @@ msgstr "Converteer naar prospect naar zakenrelatie" #. module: crm #: view:crm.meeting:0 msgid "Meeting / Partner" -msgstr "" +msgstr "Afspraak / Partner" #. module: crm #: view:crm.phonecall2opportunity:0 @@ -1880,7 +1882,7 @@ msgstr "Inkomend" #. module: crm #: view:crm.phonecall.report:0 msgid "Month of call" -msgstr "" +msgstr "Maand van het telefoongesprek" #. module: crm #: view:crm.phonecall.report:0 @@ -1914,7 +1916,7 @@ msgstr "Hoogste" #. module: crm #: help:crm.lead.report,creation_year:0 msgid "Creation year" -msgstr "" +msgstr "Aanmaak jaar" #. module: crm #: view:crm.case.section:0 @@ -1975,7 +1977,7 @@ msgstr "Herhaaloptie" #. module: crm #: view:crm.lead:0 msgid "Lead / Customer" -msgstr "" +msgstr "Lead / Klant" #. module: crm #: model:process.transition,note:crm.process_transition_leadpartner0 @@ -1993,7 +1995,7 @@ msgstr "Omzetten naar verkoopkans" #: model:ir.model,name:crm.model_crm_case_channel #: model:ir.ui.menu,name:crm.menu_crm_case_channel msgid "Channels" -msgstr "" +msgstr "Kanalen" #. module: crm #: view:crm.phonecall:0 @@ -2050,7 +2052,7 @@ msgstr "Aanmaken" #: code:addons/crm/crm_lead.py:840 #, python-format msgid "Changed Stage to: %s" -msgstr "" +msgstr "Stadium veranderd in: %s" #. module: crm #: view:crm.lead:0 @@ -2173,7 +2175,7 @@ msgstr "" #. module: crm #: view:crm.lead.report:0 msgid "Show only lead" -msgstr "" +msgstr "Toon alleen leads" #. module: crm #: help:crm.meeting,count:0 @@ -2221,7 +2223,7 @@ msgstr "Niet vastgehouden" #: code:addons/crm/crm_lead.py:491 #, python-format msgid "Please select more than one opportunities." -msgstr "" +msgstr "Selecteer aub meer dat een prospect" #. module: crm #: field:crm.lead.report,probability:0 @@ -2284,7 +2286,7 @@ msgstr "Maak een nieuwe relatie" #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound msgid "Scheduled Calls" -msgstr "" +msgstr "Ingeplande telefoongesprekken" #. module: crm #: view:crm.meeting:0 @@ -2295,7 +2297,7 @@ msgstr "Startdatum" #. module: crm #: view:crm.phonecall:0 msgid "Scheduled Phonecalls" -msgstr "" +msgstr "Ingeplande telefoongesprekken" #. module: crm #: view:crm.meeting:0 @@ -2305,7 +2307,7 @@ msgstr "Weigeren" #. module: crm #: field:crm.lead,user_email:0 msgid "User Email" -msgstr "" +msgstr "Gebruikers e-mail" #. module: crm #: help:crm.lead,optin:0 @@ -2357,7 +2359,7 @@ msgstr "Totaal geplande omzet" #. module: crm #: view:crm.lead:0 msgid "Open Opportunities" -msgstr "" +msgstr "Open prospects" #. module: crm #: model:crm.case.categ,name:crm.categ_meet2 @@ -2397,7 +2399,7 @@ msgstr "Telefoongesprekken" #. module: crm #: view:crm.case.stage:0 msgid "Stage Search" -msgstr "" +msgstr "Zoek fase" #. module: crm #: help:crm.lead.report,delay_open:0 @@ -2408,7 +2410,7 @@ msgstr "Aantal dagen tot openen dossier" #. module: crm #: selection:crm.meeting,end_type:0 msgid "Number of repetitions" -msgstr "" +msgstr "Aantal herhalingen" #. module: crm #: field:crm.lead,phone:0 @@ -2447,7 +2449,7 @@ msgstr ">" #: view:crm.opportunity2phonecall:0 #: view:crm.phonecall2phonecall:0 msgid "Schedule call" -msgstr "" +msgstr "Plan telefoongesprek" #. module: crm #: view:crm.meeting:0 @@ -2457,7 +2459,7 @@ msgstr "Onzeker" #. module: crm #: help:crm.case.stage,sequence:0 msgid "Used to order stages." -msgstr "" +msgstr "Gebruikt om fases t rangschikken" #. module: crm #: code:addons/crm/crm_lead.py:276 @@ -2483,7 +2485,7 @@ msgstr "Verminder (0>1)" #. module: crm #: field:crm.lead.report,deadline_day:0 msgid "Exp. Closing Day" -msgstr "" +msgstr "Verw. besluit datum" #. module: crm #: field:crm.case.section,change_responsible:0 @@ -2510,7 +2512,7 @@ msgstr "Overig" #. module: crm #: model:ir.actions.act_window,name:crm.open_board_crm msgid "Sales" -msgstr "" +msgstr "Verkoop" #. module: crm #: model:crm.case.categ,name:crm.categ_oppor8 @@ -2563,7 +2565,7 @@ msgstr "Bezet" #. module: crm #: field:crm.lead.report,creation_day:0 msgid "Creation Day" -msgstr "" +msgstr "Aanmaakdatum" #. module: crm #: field:crm.meeting,interval:0 @@ -2578,7 +2580,7 @@ msgstr "Terugkerend" #. module: crm #: view:crm.phonecall.report:0 msgid "Phone calls made in last month" -msgstr "" +msgstr "Gemaakte telefoongesprekken in de laatste maand" #. module: crm #: model:ir.actions.act_window,name:crm.act_my_oppor @@ -2590,6 +2592,7 @@ msgstr "Mijn open prospects" #, python-format msgid "You can not delete this lead. You should better cancel it." msgstr "" +"Het is niet mogelijk deze lead te verwijderen. U kunt deze beter annuleren." #. module: crm #: field:base.action.rule,trg_max_history:0 @@ -2649,7 +2652,7 @@ msgstr "" #. module: crm #: view:crm.lead:0 msgid "Unassigned Opportunities" -msgstr "" +msgstr "Niet toegewezen prospects" #. module: crm #: view:crm.lead.report:0 @@ -2710,7 +2713,7 @@ msgstr "Segmentatietest" #. module: crm #: field:crm.lead,user_login:0 msgid "User Login" -msgstr "" +msgstr "Gebruikersnaam" #. module: crm #: view:crm.segmentation:0 @@ -2720,7 +2723,7 @@ msgstr "Vervolg proces" #. module: crm #: view:crm.lead.report:0 msgid "Leads/Opportunities created in current year" -msgstr "" +msgstr "Leads/Prospects aangemaakt in het huidige jaar" #. module: crm #: model:ir.model,name:crm.model_crm_phonecall2partner @@ -2755,12 +2758,12 @@ msgstr "Duur" #. module: crm #: view:crm.lead:0 msgid "Show countries" -msgstr "" +msgstr "Toon landen" #. module: crm #: view:crm.lead2opportunity.partner.mass:0 msgid "Select Salesman" -msgstr "" +msgstr "Selecteer verkoper" #. module: crm #: view:board.board:0 @@ -2808,7 +2811,7 @@ msgstr "Fax" #. module: crm #: view:crm.lead.report:0 msgid "Leads/Opportunities created in current month" -msgstr "" +msgstr "Leads/Prospects aangemaakt in het huidige maaand" #. module: crm #: view:crm.meeting:0 @@ -2843,12 +2846,12 @@ msgstr "Verplicht / Optioneel" #. module: crm #: view:crm.lead:0 msgid "Unassigned Leads" -msgstr "" +msgstr "Niet toegewezen leads" #. module: crm #: field:crm.lead,subjects:0 msgid "Subject of Email" -msgstr "" +msgstr "Onderwerp van e-mail" #. module: crm #: model:ir.actions.act_window,name:crm.action_view_attendee_form @@ -2907,7 +2910,7 @@ msgstr "Berichten" #. module: crm #: help:crm.lead,channel_id:0 msgid "Communication channel (mail, direct, phone, ...)" -msgstr "" +msgstr "Communicatie kanaal (e-mail, direct, telefoon,...)" #. module: crm #: code:addons/crm/crm_action_rule.py:61 @@ -2971,7 +2974,7 @@ msgstr "" #. module: crm #: field:crm.lead,color:0 msgid "Color Index" -msgstr "" +msgstr "Kleur index" #. module: crm #: view:crm.lead:0 @@ -3027,7 +3030,7 @@ msgstr "Samenvatting gesprek" #. module: crm #: view:crm.lead:0 msgid "Todays' Leads" -msgstr "" +msgstr "Leads van vandaag" #. module: crm #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0 @@ -3138,7 +3141,7 @@ msgstr "Kanaal" #: view:crm.phonecall:0 #: view:crm.phonecall.report:0 msgid "My Sales Team(s)" -msgstr "" +msgstr "Mijn verkoop team(s)" #. module: crm #: help:crm.segmentation,exclusif:0 @@ -3179,7 +3182,7 @@ msgstr "Prospects van leads maken" #: model:ir.actions.act_window,name:crm.open_board_statistical_dash #: model:ir.ui.menu,name:crm.menu_board_statistics_dash msgid "CRM Dashboard" -msgstr "" +msgstr "CRM-dashboard" #. module: crm #: model:crm.case.categ,name:crm.categ_oppor4 @@ -3199,7 +3202,7 @@ msgstr "Zet categorie op" #. module: crm #: view:crm.meeting:0 msgid "Mail To" -msgstr "" +msgstr "E-mail naar" #. module: crm #: field:crm.meeting,th:0 @@ -3233,7 +3236,7 @@ msgstr "Kwalificatie" #. module: crm #: field:crm.lead,partner_address_email:0 msgid "Partner Contact Email" -msgstr "" +msgstr "Partner contactpersoon e-mail" #. module: crm #: code:addons/crm/wizard/crm_lead_to_partner.py:48 @@ -3249,7 +3252,7 @@ msgstr "Eerste" #. module: crm #: field:crm.lead.report,deadline_month:0 msgid "Exp. Closing Month" -msgstr "" +msgstr "Verw. Besluit maand" #. module: crm #: selection:crm.lead.report,creation_month:0 @@ -3267,7 +3270,7 @@ msgstr "Voorwaarde aan communicatiegeschiedenis" #. module: crm #: view:crm.phonecall:0 msgid "Date of Call" -msgstr "" +msgstr "Datum telefoongesprek" #. module: crm #: help:crm.segmentation,som_interval:0 @@ -3330,7 +3333,7 @@ msgstr "Herhalen" #. module: crm #: field:crm.lead.report,deadline_year:0 msgid "Ex. Closing Year" -msgstr "" +msgstr "Verw. besluit jaar" #. module: crm #: view:crm.lead:0 @@ -3391,7 +3394,7 @@ msgstr "" #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound msgid "Logged Calls" -msgstr "" +msgstr "Gelogte telefoongesprekken" #. module: crm #: field:crm.partner2opportunity,probability:0 @@ -3526,7 +3529,7 @@ msgstr "Twitter Advertenties" #: code:addons/crm/crm_lead.py:336 #, python-format msgid "The opportunity '%s' has been been won." -msgstr "" +msgstr "De prospect '%s' is gewonnen." #. module: crm #: field:crm.case.stage,case_default:0 @@ -3557,7 +3560,7 @@ msgstr "Fout! U kunt geen recursieve profielen maken." #. module: crm #: help:crm.lead.report,deadline_year:0 msgid "Expected closing year" -msgstr "" +msgstr "Verwachte besluit jaar" #. module: crm #: field:crm.lead,partner_address_id:0 @@ -3588,7 +3591,7 @@ msgstr "Afsluiten" #: selection:crm.opportunity2phonecall,action:0 #: selection:crm.phonecall2phonecall,action:0 msgid "Schedule a call" -msgstr "" +msgstr "Plan een telefoongesprek in" #. module: crm #: view:crm.lead:0 @@ -3624,7 +3627,7 @@ msgstr "Aan" #. module: crm #: view:crm.lead:0 msgid "Create date" -msgstr "" +msgstr "Aanmaakdatum" #. module: crm #: selection:crm.meeting,class:0 @@ -3677,7 +3680,7 @@ msgstr "Interesse in accessoires" #. module: crm #: view:crm.lead:0 msgid "New Opportunities" -msgstr "" +msgstr "Nieuwe prospects" #. module: crm #: code:addons/crm/crm_action_rule.py:61 @@ -3768,7 +3771,7 @@ msgstr "Verloren" #. module: crm #: view:crm.lead:0 msgid "Edit" -msgstr "" +msgstr "Bewerken" #. module: crm #: field:crm.lead,country_id:0 diff --git a/addons/web/po/zh_CN.po b/addons/web/po/zh_CN.po index 087c66bd3b3..299ff9e0a14 100644 --- a/addons/web/po/zh_CN.po +++ b/addons/web/po/zh_CN.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-20 18:48+0100\n" -"PO-Revision-Date: 2012-01-12 05:44+0000\n" -"Last-Translator: Wei \"oldrev\" Li \n" +"PO-Revision-Date: 2012-01-19 13:35+0000\n" +"Last-Translator: Jeff Wang \n" "Language-Team: Chinese (Simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-13 05:01+0000\n" -"X-Generator: Launchpad (build 14664)\n" +"X-Launchpad-Export-Date: 2012-01-20 05:05+0000\n" +"X-Generator: Launchpad (build 14700)\n" #: addons/web/static/src/js/chrome.js:162 #: addons/web/static/src/js/chrome.js:175 @@ -107,12 +107,12 @@ msgstr "无效的搜索" #: addons/web/static/src/js/search.js:403 msgid "triggered from search view" -msgstr "" +msgstr "在搜索视图进入" #: addons/web/static/src/js/search.js:490 #, python-format msgid "Incorrect value for field %(fieldname)s: [%(value)s] is %(message)s" -msgstr "" +msgstr "字段值有误。%(fieldname)s: [%(value)s] : %(message)s" #: addons/web/static/src/js/search.js:822 msgid "not a valid integer" @@ -205,7 +205,7 @@ msgstr "为假" #: addons/web/static/src/js/view_editor.js:42 msgid "ViewEditor" -msgstr "" +msgstr "界面设计器" #: addons/web/static/src/js/view_editor.js:46 #: addons/web/static/src/js/view_list.js:17 @@ -414,7 +414,7 @@ msgstr "#{text}" #: addons/web/static/src/xml/base.xml:0 msgid "Powered by" -msgstr "" +msgstr "自豪地使用" #: addons/web/static/src/xml/base.xml:0 msgid "openerp.com" @@ -617,7 +617,7 @@ msgstr "调试视图#" #: addons/web/static/src/xml/base.xml:0 msgid "- Fields View Get" -msgstr "" +msgstr "界面源代码" #: addons/web/static/src/xml/base.xml:0 msgid "- Edit" @@ -673,7 +673,7 @@ msgstr "“" #: addons/web/static/src/xml/base.xml:0 msgid "Modifiers:" -msgstr "" +msgstr "属性" #: addons/web/static/src/xml/base.xml:0 msgid "?" @@ -681,7 +681,7 @@ msgstr "？" #: addons/web/static/src/xml/base.xml:0 msgid "(nolabel)" -msgstr "" +msgstr "无标签" #: addons/web/static/src/xml/base.xml:0 msgid "Field:" @@ -713,7 +713,7 @@ msgstr "域：" #: addons/web/static/src/xml/base.xml:0 msgid "On change:" -msgstr "" +msgstr "变更时动作：" #: addons/web/static/src/xml/base.xml:0 msgid "Relation:" @@ -721,7 +721,7 @@ msgstr "关系：" #: addons/web/static/src/xml/base.xml:0 msgid "Selection:" -msgstr "" +msgstr "下拉列表：" #: addons/web/static/src/xml/base.xml:0 msgid "[" @@ -777,11 +777,11 @@ msgstr "按钮" #: addons/web/static/src/xml/base.xml:0 msgid "(no string)" -msgstr "" +msgstr "无字符串" #: addons/web/static/src/xml/base.xml:0 msgid "Special:" -msgstr "" +msgstr "特殊：" #: addons/web/static/src/xml/base.xml:0 msgid "Button Type:" @@ -875,7 +875,7 @@ msgstr "导出类型：" #: addons/web/static/src/xml/base.xml:0 msgid "Import Compatible Export" -msgstr "" +msgstr "用可导入的格式导出" #: addons/web/static/src/xml/base.xml:0 msgid "Export all Data" @@ -938,6 +938,8 @@ msgid "" "Select a .CSV file to import. If you need a sample of file to import,\n" " you should use the export tool with the \"Import Compatible\" option." msgstr "" +"选择要导入的CSV文件。如果需要导入文件的模版，\n" +"可以用导出工具并选中 “导入兼容”" #: addons/web/static/src/xml/base.xml:0 msgid "CSV File:" @@ -1032,6 +1034,10 @@ msgid "" "supply chain,\n" " project management, production, services, CRM, etc..." msgstr "" +"是个自由的企业级软件系统，通过信息集成提升企业\n" +"生产力和盈利能力。它连接、改进和管控企业流程的\n" +"方方面面。包括销售、财务、供应链、项目管理、生\n" +"产、服务和客户关系管理等" #: addons/web/static/src/xml/base.xml:0 msgid "" @@ -1044,6 +1050,9 @@ msgid "" " production system and migration to a new version to be " "straightforward." msgstr "" +"该系统是跨平台的，可以安装在Windows、Mac OSX\n" +"和各种Linux或类UNIX发行版上。 它的架构支持\n" +"快速开发新功能、修改现有功能或直接升级到新版本" #: addons/web/static/src/xml/base.xml:0 msgid "" diff --git a/addons/web_dashboard/po/zh_CN.po b/addons/web_dashboard/po/zh_CN.po index c8701dd375e..f201f6994b2 100644 --- a/addons/web_dashboard/po/zh_CN.po +++ b/addons/web_dashboard/po/zh_CN.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-20 18:48+0100\n" -"PO-Revision-Date: 2012-01-12 05:35+0000\n" -"Last-Translator: Wei \"oldrev\" Li \n" +"PO-Revision-Date: 2012-01-19 13:40+0000\n" +"Last-Translator: Jeff Wang \n" "Language-Team: Chinese (Simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-13 05:01+0000\n" -"X-Generator: Launchpad (build 14664)\n" +"X-Launchpad-Export-Date: 2012-01-20 05:05+0000\n" +"X-Generator: Launchpad (build 14700)\n" #: addons/web_dashboard/static/src/js/dashboard.js:63 msgid "Edit Layout" @@ -53,7 +53,7 @@ msgstr "%" msgid "" "Click on the functionalites listed below to launch them and configure your " "system" -msgstr "" +msgstr "单击以下功能列表打开配置界面" #: addons/web_dashboard/static/src/xml/web_dashboard.xml:0 msgid "Welcome to OpenERP" diff --git a/addons/web_diagram/po/zh_CN.po b/addons/web_diagram/po/zh_CN.po index 63d570efe65..81df135c4c0 100644 --- a/addons/web_diagram/po/zh_CN.po +++ b/addons/web_diagram/po/zh_CN.po @@ -8,18 +8,18 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-20 18:48+0100\n" -"PO-Revision-Date: 2012-01-12 05:36+0000\n" -"Last-Translator: Wei \"oldrev\" Li \n" +"PO-Revision-Date: 2012-01-19 13:42+0000\n" +"Last-Translator: Jeff Wang \n" "Language-Team: Chinese (Simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-13 05:01+0000\n" -"X-Generator: Launchpad (build 14664)\n" +"X-Launchpad-Export-Date: 2012-01-20 05:05+0000\n" +"X-Generator: Launchpad (build 14700)\n" #: addons/web_diagram/static/src/js/diagram.js:11 msgid "Diagram" -msgstr "" +msgstr "图表" #: addons/web_diagram/static/src/js/diagram.js:210 msgid "Cancel" diff --git a/addons/web_graph/po/zh_CN.po b/addons/web_graph/po/zh_CN.po index 6ff1d55c867..6f3e8e5f8ff 100644 --- a/addons/web_graph/po/zh_CN.po +++ b/addons/web_graph/po/zh_CN.po @@ -8,15 +8,15 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-20 18:48+0100\n" -"PO-Revision-Date: 2012-01-07 05:43+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-01-19 13:43+0000\n" +"Last-Translator: hifly \n" "Language-Team: Chinese (Simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-08 05:27+0000\n" -"X-Generator: Launchpad (build 14640)\n" +"X-Launchpad-Export-Date: 2012-01-20 05:05+0000\n" +"X-Generator: Launchpad (build 14700)\n" #: addons/web_graph/static/src/js/graph.js:19 msgid "Graph" -msgstr "" +msgstr "图形" From 9b54bdeb1885dc76a1579e00d584a9b248b7c809 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 20 Jan 2012 11:56:08 +0100 Subject: [PATCH 09/19] [ADD] dynamic view: handle setting domains via onchange lp bug: https://launchpad.net/bugs/911676 fixed bzr revid: xmo@openerp.com-20120120105608-zjbam8ki4uoqer5v --- addons/web/controllers/main.py | 12 ++++++++++++ addons/web/static/src/js/view_form.js | 12 ++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 261d77caa24..df3163d4e6c 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -837,6 +837,18 @@ class DataSet(openerpweb.Controller): return getattr(req.session.model(model), method)(*args, **kwargs) + @openerpweb.jsonrequest + def onchange(self, req, model, method, args, context_id=None): + result = self.call_common(req, model, method, args, context_id=context_id) + if 'domain' not in result: + return result + + result['domain'] = dict( + (k, parse_domain(v, req.session)) + for k, v in result['domain'].iteritems()) + + return result + @openerpweb.jsonrequest def call(self, req, model, method, args, domain_id=None, context_id=None): return self.call_common(req, model, method, args, domain_id, context_id) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 17e46f6085c..2172ae103b8 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -316,7 +316,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView# var change_spec = self.parse_on_change(on_change, widget); if (change_spec) { var ajax = { - url: '/web/dataset/call', + url: '/web/dataset/onchange', async: false }; return self.rpc(ajax, { @@ -342,6 +342,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView# var result = response; if (result.value) { for (var f in result.value) { + if (!result.value.hasOwnProperty(f)) { continue; } var field = this.fields[f]; // If field is not defined in the view, just ignore it if (field) { @@ -367,7 +368,14 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView# }); } if (result.domain) { - // TODO: + function edit_domain(node) { + var new_domain = result.domain[node.attrs.name]; + if (new_domain) { + node.attrs.domain = new_domain; + } + _(node.children).each(edit_domain); + } + edit_domain(this.fields_view.arch); } return $.Deferred().resolve(); } catch(e) { From 217c180fa29514e67e54e13f4eca515e9a649c3b Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Fri, 20 Jan 2012 12:06:50 +0100 Subject: [PATCH 10/19] [FIX+REF] account_analytic_analysis: fixed the dependancies and a bug related to wrong computation of is_overdue_quantity that was also counting the sales/purchases made instead of only considering the timesheet entries. Refactoring: 200 lines removed, as they were useless since commit 6305 (removal of consolidation on all fields), and as they were filthy and error prone since they were written -_- bzr revid: qdp-launchpad@openerp.com-20120120110650-zho7p4mem5vqebse --- .../account_analytic_analysis/__openerp__.py | 2 +- .../account_analytic_analysis.py | 200 +----------------- 2 files changed, 4 insertions(+), 198 deletions(-) diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py index 01ef6a3cb81..2f4d4446ee7 100644 --- a/addons/account_analytic_analysis/__openerp__.py +++ b/addons/account_analytic_analysis/__openerp__.py @@ -36,7 +36,7 @@ user-wise as well as month wise. "author" : "Camptocamp", "website" : "http://www.camptocamp.com/", "images" : ["images/bill_tasks_works.jpeg","images/overpassed_accounts.jpeg"], - "depends" : ["hr_timesheet_invoice"], + "depends" : ["hr_timesheet_invoice", "sale"], #although sale is technically not required to install this module, all menuitems are located under 'Sales' application "init_xml" : [], "update_xml": [ "security/ir.model.access.csv", diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index d379ba232fc..20c170cb5c0 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -322,7 +322,7 @@ class account_analytic_account(osv.osv): result = dict.fromkeys(ids, 0) for record in self.browse(cr, uid, ids, context=context): if record.quantity_max > 0.0: - result[record.id] = int(record.quantity >= record.quantity_max) + result[record.id] = int(record.hours_quantity >= record.quantity_max) else: result[record.id] = 0 return result @@ -413,8 +413,7 @@ class account_analytic_account_summary_user(osv.osv): _columns = { 'account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True), - 'unit_amount': fields.function(_unit_amount, type='float', - string='Total Time'), + 'unit_amount': fields.float('Total Time'), 'user': fields.many2one('res.users', 'User'), } @@ -454,96 +453,6 @@ class account_analytic_account_summary_user(osv.osv): 'GROUP BY u."user", u.account_id, u.max_user' \ ')') - def _read_flat(self, cr, user, ids, fields, context=None, load='_classic_read'): - if context is None: - context = {} - if not ids: - return [] - - if fields is None: - fields = self._columns.keys() - res_trans_obj = self.pool.get('ir.translation') - - # construct a clause for the rules: - d1, d2, tables = self.pool.get('ir.rule').domain_get(cr, user, self._name, 'read', context=context) - - # all inherited fields + all non inherited fields for which the attribute whose name is in load is True - fields_pre = filter(lambda x: x in self._columns and getattr(self._columns[x],'_classic_write'), fields) + self._inherits.values() - res = [] - cr.execute('SELECT MAX(id) FROM res_users') - max_user = cr.fetchone()[0] - if fields_pre: - fields_pre2 = map(lambda x: (x in ('create_date', 'write_date')) and ('date_trunc(\'second\', '+x+') as '+x) or '"'+x+'"', fields_pre) - for i in range(0, len(ids), cr.IN_MAX): - sub_ids = ids[i:i+cr.IN_MAX] - if d1: - cr.execute('SELECT %s FROM \"%s\" WHERE id IN (%s) ' \ - 'AND account_id IN (%s) ' \ - 'AND "user" IN (%s) AND %s ORDER BY %s' % \ - (','.join(fields_pre2 + ['id']), self._table, - ','.join([str(x) for x in sub_ids]), - ','.join([str(x/max_user - (x%max_user == 0 and 1 or 0)) for x in sub_ids]), - ','.join([str(x-((x/max_user - (x%max_user == 0 and 1 or 0)) *max_user)) for x in sub_ids]), d1, - self._order),d2) - if not cr.rowcount == len({}.fromkeys(sub_ids)): - raise except_orm(_('AccessError'), - _('You try to bypass an access rule (Document type: %s).') % self._description) - else: - cr.execute('SELECT %s FROM \"%s\" WHERE id IN (%s) ' \ - 'AND account_id IN (%s) ' \ - 'AND "user" IN (%s) ORDER BY %s' % \ - (','.join(fields_pre2 + ['id']), self._table, - ','.join([str(x) for x in sub_ids]), - ','.join([str(x/max_user - (x%max_user == 0 and 1 or 0)) for x in sub_ids]), - ','.join([str(x-((x/max_user - (x%max_user == 0 and 1 or 0)) *max_user)) for x in sub_ids]), - self._order)) - res.extend(cr.dictfetchall()) - else: - res = map(lambda x: {'id': x}, ids) - for f in fields_pre: - if self._columns[f].translate: - ids = map(lambda x: x['id'], res) - res_trans = res_trans_obj._get_ids(cr, user, self._name+','+f, 'model', context.get('lang', False) or 'en_US', ids) - for r in res: - r[f] = res_trans.get(r['id'], False) or r[f] - - for table in self._inherits: - col = self._inherits[table] - cols = intersect(self._inherit_fields.keys(), fields) - if not cols: - continue - res2 = self.pool.get(table).read(cr, user, [x[col] for x in res], cols, context, load) - - res3 = {} - for r in res2: - res3[r['id']] = r - del r['id'] - - for record in res: - record.update(res3[record[col]]) - if col not in fields: - del record[col] - - # all fields which need to be post-processed by a simple function (symbol_get) - fields_post = filter(lambda x: x in self._columns and self._columns[x]._symbol_get, fields) - if fields_post: - # maybe it would be faster to iterate on the fields then on res, so that we wouldn't need - # to get the _symbol_get in each occurence - for r in res: - for f in fields_post: - r[f] = self.columns[f]._symbol_get(r[f]) - ids = map(lambda x: x['id'], res) - - # all non inherited fields for which the attribute whose name is in load is False - fields_post = filter(lambda x: x in self._columns and not getattr(self._columns[x], load), fields) - for f in fields_post: - # get the value of that field for all records/ids - res2 = self._columns[f].get(cr, self, ids, f, user, context=context, values=res) - for record in res: - record[f] = res2[record['id']] - - return res - account_analytic_account_summary_user() class account_analytic_account_summary_month(osv.osv): @@ -552,26 +461,9 @@ class account_analytic_account_summary_month(osv.osv): _auto = False _rec_name = 'month' - def _unit_amount(self, cr, uid, ids, name, arg, context=None): - res = {} - account_obj = self.pool.get('account.analytic.account') - account_ids = [int(str(int(x))[:-6]) for x in ids] - month_ids = [int(str(int(x))[-6:]) for x in ids] - parent_ids = tuple(ids) #We don't want consolidation for each of these fields because those complex computation is resource-greedy. - if parent_ids: - cr.execute('SELECT id, unit_amount ' \ - 'FROM account_analytic_analysis_summary_month ' \ - 'WHERE account_id IN %s ' \ - 'AND month_id IN %s ',(parent_ids, tuple(month_ids),)) - for sum_id, unit_amount in cr.fetchall(): - res[sum_id] = unit_amount - for id in ids: - res[id] = round(res.get(id, 0.0), 2) - return res - _columns = { 'account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True), - 'unit_amount': fields.function(_unit_amount, type='float', string='Total Time'), + 'unit_amount': fields.float('Total Time'), 'month': fields.char('Month', size=32, readonly=True), } @@ -622,92 +514,6 @@ class account_analytic_account_summary_month(osv.osv): 'GROUP BY d.month, d.account_id ' \ ')') - def _read_flat(self, cr, user, ids, fields, context=None, load='_classic_read'): - if context is None: - context = {} - if not ids: - return [] - - if fields is None: - fields = self._columns.keys() - res_trans_obj = self.pool.get('ir.translation') - # construct a clause for the rules: - d1, d2, tables= self.pool.get('ir.rule').domain_get(cr, user, self._name) - - # all inherited fields + all non inherited fields for which the attribute whose name is in load is True - fields_pre = filter(lambda x: x in self._columns and getattr(self._columns[x],'_classic_write'), fields) + self._inherits.values() - res = [] - if fields_pre: - fields_pre2 = map(lambda x: (x in ('create_date', 'write_date')) and ('date_trunc(\'second\', '+x+') as '+x) or '"'+x+'"', fields_pre) - for i in range(0, len(ids), cr.IN_MAX): - sub_ids = ids[i:i+cr.IN_MAX] - if d1: - cr.execute('SELECT %s FROM \"%s\" WHERE id IN (%s) ' \ - 'AND account_id IN (%s) ' \ - 'AND month_id IN (%s) AND %s ORDER BY %s' % \ - (','.join(fields_pre2 + ['id']), self._table, - ','.join([str(x) for x in sub_ids]), - ','.join([str(x)[:-6] for x in sub_ids]), - ','.join([str(x)[-6:] for x in sub_ids]), d1, - self._order),d2) - if not cr.rowcount == len({}.fromkeys(sub_ids)): - raise except_orm(_('AccessError'), - _('You try to bypass an access rule (Document type: %s).') % self._description) - else: - cr.execute('SELECT %s FROM \"%s\" WHERE id IN (%s) ' \ - 'AND account_id IN (%s) ' \ - 'AND month_id IN (%s) ORDER BY %s' % \ - (','.join(fields_pre2 + ['id']), self._table, - ','.join([str(x) for x in sub_ids]), - ','.join([str(x)[:-6] for x in sub_ids]), - ','.join([str(x)[-6:] for x in sub_ids]), - self._order)) - res.extend(cr.dictfetchall()) - else: - res = map(lambda x: {'id': x}, ids) - - for f in fields_pre: - if self._columns[f].translate: - ids = map(lambda x: x['id'], res) - res_trans = res_trans_obj._get_ids(cr, user, self._name+','+f, 'model', context.get('lang', False) or 'en_US', ids) - for r in res: - r[f] = res_trans.get(r['id'], False) or r[f] - - for table in self._inherits: - col = self._inherits[table] - cols = intersect(self._inherit_fields.keys(), fields) - if not cols: - continue - res2 = self.pool.get(table).read(cr, user, [x[col] for x in res], cols, context, load) - - res3 = {} - for r in res2: - res3[r['id']] = r - del r['id'] - - for record in res: - record.update(res3[record[col]]) - if col not in fields: - del record[col] - - # all fields which need to be post-processed by a simple function (symbol_get) - fields_post = filter(lambda x: x in self._columns and self._columns[x]._symbol_get, fields) - if fields_post: - # maybe it would be faster to iterate on the fields then on res, so that we wouldn't need - # to get the _symbol_get in each occurence - for r in res: - for f in fields_post: - r[f] = self.columns[f]._symbol_get(r[f]) - ids = map(lambda x: x['id'], res) - - # all non inherited fields for which the attribute whose name is in load is False - fields_post = filter(lambda x: x in self._columns and not getattr(self._columns[x], load), fields) - for f in fields_post: - # get the value of that field for all records/ids - res2 = self._columns[f].get(cr, self, ids, f, user, context=context, values=res) - for record in res: - record[f] = res2[record['id']] - return res account_analytic_account_summary_month() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From ba178be7c0828dc0df33b0d22347cc9e92dbb574 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Fri, 20 Jan 2012 12:46:12 +0100 Subject: [PATCH 11/19] [IMP] gunicorn: add CPU and memory limits. bzr revid: vmt@openerp.com-20120120114612-xowu57yy3f5uxi0j --- gunicorn.conf.py | 34 ++++++++++++++- openerp/tests/addons/test_limits/__init__.py | 3 ++ .../tests/addons/test_limits/__openerp__.py | 15 +++++++ openerp/tests/addons/test_limits/models.py | 43 +++++++++++++++++++ openerp/wsgi.py | 1 + 5 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 openerp/tests/addons/test_limits/__init__.py create mode 100644 openerp/tests/addons/test_limits/__openerp__.py create mode 100644 openerp/tests/addons/test_limits/models.py diff --git a/gunicorn.conf.py b/gunicorn.conf.py index 9962493d549..c575d53875f 100644 --- a/gunicorn.conf.py +++ b/gunicorn.conf.py @@ -17,7 +17,7 @@ pidfile = '.gunicorn.pid' # Gunicorn recommends 2-4 x number_of_cpu_cores, but # you'll want to vary this a bit to find the best for your # particular work load. -workers = 4 +workers = 1 # Some application-wide initialization is needed. on_starting = openerp.wsgi.on_starting @@ -27,6 +27,8 @@ when_ready = openerp.wsgi.when_ready # big reports for example timeout = 240 +#max_requests = 150 + # Equivalent of --load command-line option openerp.conf.server_wide_modules = ['web'] @@ -35,7 +37,7 @@ conf = openerp.tools.config # Path to the OpenERP Addons repository (comma-separated for # multiple locations) -conf['addons_path'] = '/home/openerp/addons/trunk,/home/openerp/web/trunk/addons' +conf['addons_path'] = '/home/thu/repos/addons/trunk,/home/thu/repos/web/trunk/addons,/home/thu/repos/server/trunk-limits/openerp/tests/addons' # Optional database config if not using local socket #conf['db_name'] = 'mycompany' @@ -52,5 +54,33 @@ conf['addons_path'] = '/home/openerp/addons/trunk,/home/openerp/web/trunk/addons # If --static-http-enable is used, path for the static web directory #conf['static_http_document_root'] = '/var/www' +def time_expired(n, stack): + import os + import time + print '>>> [%s] time ran out.' % (os.getpid()) + raise Exception('(time ran out)') + +def pre_request(worker, req): + import os + import psutil + import resource + import signal + # VMS and RLIMIT_AS are the same thing: virtual memory, a.k.a. address space + rss, vms = psutil.Process(os.getpid()).get_memory_info() + soft, hard = resource.getrlimit(resource.RLIMIT_AS) + print ">>>>>> [%s] %s %s %s %s %s" % (os.getpid(), vms, req.method, req.path, req.query, req.fragment) + print ">>>>>> %s" % (req.body,) + # Let's say 512MB is ok, 768 is a hard limit (will raise MemoryError), + # 640 will nicely restart the process. + resource.setrlimit(resource.RLIMIT_AS, (768 * 1024 * 1024, hard)) + if vms > 640 * 1024 * 1024: + print ">>> Worker eating too much memory, reset it after the request." + worker.alive = False # Commit suicide after the request. + + r = resource.getrusage(resource.RUSAGE_SELF) + cpu_time = r.ru_utime + r.ru_stime + signal.signal(signal.SIGXCPU, time_expired) + soft, hard = resource.getrlimit(resource.RLIMIT_CPU) + resource.setrlimit(resource.RLIMIT_CPU, (cpu_time + 15, hard)) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/tests/addons/test_limits/__init__.py b/openerp/tests/addons/test_limits/__init__.py new file mode 100644 index 00000000000..fe4487156b1 --- /dev/null +++ b/openerp/tests/addons/test_limits/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- +import models +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/tests/addons/test_limits/__openerp__.py b/openerp/tests/addons/test_limits/__openerp__.py new file mode 100644 index 00000000000..333f1fe4372 --- /dev/null +++ b/openerp/tests/addons/test_limits/__openerp__.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +{ + 'name': 'test-limits', + 'version': '0.1', + 'category': 'Tests', + 'description': """A module with dummy methods.""", + 'author': 'OpenERP SA', + 'maintainer': 'OpenERP SA', + 'website': 'http://www.openerp.com', + 'depends': ['base'], + 'data': [], + 'installable': True, + 'active': False, +} +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/tests/addons/test_limits/models.py b/openerp/tests/addons/test_limits/models.py new file mode 100644 index 00000000000..435e93811fc --- /dev/null +++ b/openerp/tests/addons/test_limits/models.py @@ -0,0 +1,43 @@ +# -*- coding: utf-8 -*- +import time + +import openerp + +class m(openerp.osv.osv.Model): + """ This model exposes a few methods that will consume between 'almost no + resource' and 'a lot of resource'. + """ + _name = 'test.limits.model' + + def consume_nothing(self, cr, uid, context=None): + return True + + def consume_memory(self, cr, uid, size, context=None): + l = [0] * size + return True + + def leak_memory(self, cr, uid, size, context=None): + if not hasattr(self, 'l'): + self.l = [] + self.l.append([0] * size) + print ">>>", len(self.l) + return True + + def consume_time(self, cr, uid, seconds, context=None): + time.sleep(seconds) + return True + + def consume_cpu_time(self, cr, uid, seconds, context=None): + import os + t0 = time.clock() + t1 = time.clock() +# try: + while t1 - t0 < seconds: + print "[%s] ..." % os.getpid() + for i in xrange(10000000): + x = i * i + t1 = time.clock() +# except Exception, e: +# print "+++", e + return True +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/wsgi.py b/openerp/wsgi.py index aeba38dcfbc..b9263b42352 100644 --- a/openerp/wsgi.py +++ b/openerp/wsgi.py @@ -460,6 +460,7 @@ def on_starting(server): openerp.service.web_services.start_web_services() openerp.modules.module.initialize_sys_path() openerp.modules.loading.open_openerp_namespace() + openerp.pooler.get_db_and_pool('xx', update_module=False, pooljobs=False) for m in openerp.conf.server_wide_modules: try: __import__(m) From 7b38be73702ad7bf41a7332b64d07ae9aa047672 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 20 Jan 2012 13:49:30 +0100 Subject: [PATCH 12/19] [FIX] DataSetStatic.read_slice called with no options should not blow up lp bug: https://launchpad.net/bugs/919161 fixed bzr revid: xmo@openerp.com-20120120124930-zug80i862x9mwu34 --- addons/web/static/src/js/data.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js index bb53fb2175a..a4d9e9e4d71 100644 --- a/addons/web/static/src/js/data.js +++ b/addons/web/static/src/js/data.js @@ -309,7 +309,7 @@ openerp.web.DataSet = openerp.web.Widget.extend( /** @lends openerp.web.DataSet * domain and context. * * @param {Array} [fields] fields to read and return, by default all fields are returned - * @params {Object} options + * @params {Object} [options] * @param {Number} [options.offset=0] The index from which selected records should be returned * @param {Number} [options.limit=null] The maximum number of records to return * @returns {$.Deferred} @@ -504,11 +504,11 @@ openerp.web.DataSetStatic = openerp.web.DataSet.extend({ this.ids = ids || []; }, read_slice: function (fields, options) { + options = options || {}; + fields = fields || {}; // TODO remove fields from options - var self = this, - offset = options.offset || 0, - limit = options.limit || false, - fields = fields || false; + var offset = options.offset || 0, + limit = options.limit || false; var end_pos = limit && limit !== -1 ? offset + limit : this.ids.length; return this.read_ids(this.ids.slice(offset, end_pos), fields); }, @@ -560,8 +560,8 @@ openerp.web.DataSetSearch = openerp.web.DataSet.extend(/** @lends openerp.web.D * @returns {$.Deferred} */ read_slice: function (fields, options) { + options = options || {}; var self = this; - var options = options || {}; var offset = options.offset || 0; return this.rpc('/web/dataset/search_read', { model: this.model, From 86b15b7e9d850829aff1f1e6a07e0c96299e492b Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 20 Jan 2012 15:59:25 +0100 Subject: [PATCH 13/19] [FIX] error reporting in _.sprintf bzr revid: xmo@openerp.com-20120120145925-jko6qqombu3fxpoj --- .../web/static/lib/underscore/underscore.string.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/web/static/lib/underscore/underscore.string.js b/addons/web/static/lib/underscore/underscore.string.js index 99966c3f475..d0b6ff1ffb3 100644 --- a/addons/web/static/lib/underscore/underscore.string.js +++ b/addons/web/static/lib/underscore/underscore.string.js @@ -73,7 +73,7 @@ arg = argv[cursor]; for (k = 0; k < match[2].length; k++) { if (!arg.hasOwnProperty(match[2][k])) { - throw(sprintf('[_.sprintf] property "%s" does not exist', match[2][k])); + throw new Error(sprintf('[_.sprintf] property "%s" does not exist', match[2][k])); } arg = arg[match[2][k]]; } @@ -85,7 +85,7 @@ } if (/[^s]/.test(match[8]) && (get_type(arg) != 'number')) { - throw(sprintf('[_.sprintf] expecting number but found %s', get_type(arg))); + throw new Error(sprintf('[_.sprintf] expecting number but found %s', get_type(arg))); } switch (match[8]) { case 'b': arg = arg.toString(2); break; @@ -134,12 +134,12 @@ field_list.push(field_match[1]); } else { - throw('[_.sprintf] huh?'); + throw new Error('[_.sprintf] huh?'); } } } else { - throw('[_.sprintf] huh?'); + throw new Error('[_.sprintf] huh?'); } match[2] = field_list; } @@ -147,12 +147,12 @@ arg_names |= 2; } if (arg_names === 3) { - throw('[_.sprintf] mixing positional and named placeholders is not (yet) supported'); + throw new Error('[_.sprintf] mixing positional and named placeholders is not (yet) supported'); } parse_tree.push(match); } else { - throw('[_.sprintf] huh?'); + throw new Error('[_.sprintf] huh?'); } _fmt = _fmt.substring(match[0].length); } From 09347af434e8ebe1ad828c44703ec8d8ab6870d8 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Fri, 20 Jan 2012 16:00:50 +0100 Subject: [PATCH 14/19] [IMP] gunicorn: moved gunicorn hook to openerp.wsgi (just like previous hooks), added new command-line options. bzr revid: vmt@openerp.com-20120120150050-3o3hg6k1n17alup0 --- gunicorn.conf.py | 32 ++------------------------------ openerp/tools/config.py | 17 ++++++++++++++++- openerp/wsgi.py | 29 +++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 31 deletions(-) diff --git a/gunicorn.conf.py b/gunicorn.conf.py index c575d53875f..05feb71ada8 100644 --- a/gunicorn.conf.py +++ b/gunicorn.conf.py @@ -22,12 +22,13 @@ workers = 1 # Some application-wide initialization is needed. on_starting = openerp.wsgi.on_starting when_ready = openerp.wsgi.when_ready +pre_request = openerp.wsgi.pre_request # openerp request-response cycle can be quite long for # big reports for example timeout = 240 -#max_requests = 150 +max_requests = 2000 # Equivalent of --load command-line option openerp.conf.server_wide_modules = ['web'] @@ -54,33 +55,4 @@ conf['addons_path'] = '/home/thu/repos/addons/trunk,/home/thu/repos/web/trunk/ad # If --static-http-enable is used, path for the static web directory #conf['static_http_document_root'] = '/var/www' -def time_expired(n, stack): - import os - import time - print '>>> [%s] time ran out.' % (os.getpid()) - raise Exception('(time ran out)') - -def pre_request(worker, req): - import os - import psutil - import resource - import signal - # VMS and RLIMIT_AS are the same thing: virtual memory, a.k.a. address space - rss, vms = psutil.Process(os.getpid()).get_memory_info() - soft, hard = resource.getrlimit(resource.RLIMIT_AS) - print ">>>>>> [%s] %s %s %s %s %s" % (os.getpid(), vms, req.method, req.path, req.query, req.fragment) - print ">>>>>> %s" % (req.body,) - # Let's say 512MB is ok, 768 is a hard limit (will raise MemoryError), - # 640 will nicely restart the process. - resource.setrlimit(resource.RLIMIT_AS, (768 * 1024 * 1024, hard)) - if vms > 640 * 1024 * 1024: - print ">>> Worker eating too much memory, reset it after the request." - worker.alive = False # Commit suicide after the request. - - r = resource.getrusage(resource.RUSAGE_SELF) - cpu_time = r.ru_utime + r.ru_stime - signal.signal(signal.SIGXCPU, time_expired) - soft, hard = resource.getrlimit(resource.RLIMIT_CPU) - resource.setrlimit(resource.RLIMIT_CPU, (cpu_time + 15, hard)) - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/tools/config.py b/openerp/tools/config.py index 8107e10bf85..4f33c3b79f1 100644 --- a/openerp/tools/config.py +++ b/openerp/tools/config.py @@ -266,6 +266,20 @@ class configmanager(object): group.add_option("--max-cron-threads", dest="max_cron_threads", my_default=4, help="Maximum number of threads processing concurrently cron jobs.", type="int") + # TODO sensible default for the three following limits. + group.add_option("--virtual-memory-limit", dest="virtual_memory_limit", my_default=768 * 1024 * 1024, + help="Maximum allowed virtual memory per Gunicorn process. " + "When the limit is reached, any memory allocation will fail.", + type="int") + group.add_option("--virtual-memory-reset", dest="virtual_memory_reset", my_default=640 * 1024 * 1024, + help="Maximum allowed virtual memory per Gunicorn process. " + "When the limit is reached, the worker will be reset after " + "the current request.", + type="int") + group.add_option("--cpu-time-limit", dest="cpu_time_limit", my_default=60, + help="Maximum allowed CPU time per Gunicorn process. " + "When the limit is reached, an exception is raised.", + type="int") group.add_option("--unaccent", dest="unaccent", my_default=False, action="store_true", help="Use the unaccent function provided by the database when available.") @@ -371,7 +385,8 @@ class configmanager(object): 'stop_after_init', 'logrotate', 'without_demo', 'netrpc', 'xmlrpc', 'syslog', 'list_db', 'xmlrpcs', 'test_file', 'test_disable', 'test_commit', 'test_report_directory', - 'osv_memory_count_limit', 'osv_memory_age_limit', 'max_cron_threads', 'unaccent', + 'osv_memory_count_limit', 'osv_memory_age_limit', 'max_cron_threads', + 'virtual_memory_limit', 'virtual_memory_reset', 'cpu_time_limit', 'unaccent', ] for arg in keys: diff --git a/openerp/wsgi.py b/openerp/wsgi.py index b9263b42352..88c75539dc2 100644 --- a/openerp/wsgi.py +++ b/openerp/wsgi.py @@ -481,12 +481,41 @@ def when_ready(server): # Hijack gunicorn's SIGWINCH handling; we can choose another one. signal.signal(signal.SIGWINCH, make_winch_handler(server)) +# Install limits on virtual memory and CPU time consumption. +def pre_request(worker, req): + import os + import psutil + import resource + import signal + # VMS and RLIMIT_AS are the same thing: virtual memory, a.k.a. address space + rss, vms = psutil.Process(os.getpid()).get_memory_info() + soft, hard = resource.getrlimit(resource.RLIMIT_AS) + print ">>>>>> [%s] %s %s %s %s %s" % (os.getpid(), vms, req.method, req.path, req.query, req.fragment) + print ">>>>>> %s" % (req.body,) + resource.setrlimit(resource.RLIMIT_AS, (config['virtual_memory_limit'], hard)) + if vms > config['virtual_memory_reset']: + print ">>> Worker eating too much memory, reset it after the request." + worker.alive = False # Commit suicide after the request. + + r = resource.getrusage(resource.RUSAGE_SELF) + cpu_time = r.ru_utime + r.ru_stime + signal.signal(signal.SIGXCPU, time_expired) + soft, hard = resource.getrlimit(resource.RLIMIT_CPU) + resource.setrlimit(resource.RLIMIT_CPU, (cpu_time + config['cpu_time_limit'], hard)) + # Our signal handler will signal a SGIQUIT to all workers. def make_winch_handler(server): def handle_winch(sig, fram): server.kill_workers(signal.SIGQUIT) # This is gunicorn specific. return handle_winch +# SIGXCPU (exceeded CPU time) signal handler will raise an exception. +def time_expired(n, stack): + import os + import time + print '>>> [%s] time ran out.' % (os.getpid()) + raise Exception('(time ran out)') # TODO one of openerp.exception + # Kill gracefuly the workers (e.g. because we want to clear their cache). # This is done by signaling a SIGWINCH to the master process, so it can be # called by the workers themselves. From 48459b568a6a28ce541681d1fa992751f9092db5 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 20 Jan 2012 16:30:46 +0100 Subject: [PATCH 15/19] [FIX] get_value called on readonly reference widget before its name_get has had the time to run lp bug: https://launchpad.net/bugs/919225 fixed bzr revid: xmo@openerp.com-20120120153046-fkq105mmzooo58q5 --- addons/web/static/src/js/view_page.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_page.js b/addons/web/static/src/js/view_page.js index 31190d70f85..7057a454bca 100644 --- a/addons/web/static/src/js/view_page.js +++ b/addons/web/static/src/js/view_page.js @@ -198,7 +198,14 @@ openerp.web.page = function (openerp) { if (!this.value) { return null; } - return _.str.sprintf('%s,%d', this.field.relation, this.value[0]); + var id; + if (typeof this.value === 'number') { + // name_get has not run yet + id = this.value; + } else { + id = this.value[0]; + } + return _.str.sprintf('%s,%d', this.field.relation, id); } }); From 5e2721aaf247a75f8361f1272617b2cf7c27bafd Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Fri, 20 Jan 2012 16:43:22 +0100 Subject: [PATCH 16/19] [IMP] gunicorn: commit suicide in the post_request hook instead of the pre_request hook. bzr revid: vmt@openerp.com-20120120154322-f23rxofv0169tbsm --- gunicorn.conf.py | 1 + openerp/wsgi.py | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/gunicorn.conf.py b/gunicorn.conf.py index 05feb71ada8..4d85fa2b6c0 100644 --- a/gunicorn.conf.py +++ b/gunicorn.conf.py @@ -23,6 +23,7 @@ workers = 1 on_starting = openerp.wsgi.on_starting when_ready = openerp.wsgi.when_ready pre_request = openerp.wsgi.pre_request +post_request = openerp.wsgi.post_request # openerp request-response cycle can be quite long for # big reports for example diff --git a/openerp/wsgi.py b/openerp/wsgi.py index 88c75539dc2..ed03ed9bc6c 100644 --- a/openerp/wsgi.py +++ b/openerp/wsgi.py @@ -491,11 +491,7 @@ def pre_request(worker, req): rss, vms = psutil.Process(os.getpid()).get_memory_info() soft, hard = resource.getrlimit(resource.RLIMIT_AS) print ">>>>>> [%s] %s %s %s %s %s" % (os.getpid(), vms, req.method, req.path, req.query, req.fragment) - print ">>>>>> %s" % (req.body,) resource.setrlimit(resource.RLIMIT_AS, (config['virtual_memory_limit'], hard)) - if vms > config['virtual_memory_reset']: - print ">>> Worker eating too much memory, reset it after the request." - worker.alive = False # Commit suicide after the request. r = resource.getrusage(resource.RUSAGE_SELF) cpu_time = r.ru_utime + r.ru_stime @@ -503,6 +499,15 @@ def pre_request(worker, req): soft, hard = resource.getrlimit(resource.RLIMIT_CPU) resource.setrlimit(resource.RLIMIT_CPU, (cpu_time + config['cpu_time_limit'], hard)) +# Reset the worker if it consumes too much memory (e.g. caused by a memory leak). +def post_request(worker, req, environ): + import os + import psutil + rss, vms = psutil.Process(os.getpid()).get_memory_info() + if vms > config['virtual_memory_reset']: + print ">>> Worker eating too much memory, reset it after the request." + worker.alive = False # Commit suicide after the request. + # Our signal handler will signal a SGIQUIT to all workers. def make_winch_handler(server): def handle_winch(sig, fram): From 30d7253fef235bbb117aeec0a27c7c5e3c436c4a Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Fri, 20 Jan 2012 17:04:09 +0100 Subject: [PATCH 17/19] [IMP] gunicorn: changed `print` with `logging.info`. bzr revid: vmt@openerp.com-20120120160409-cu1vcw7cfa3z0zgy --- gunicorn.conf.py | 2 +- openerp/tests/addons/test_limits/models.py | 5 ----- openerp/wsgi.py | 10 ++++------ 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/gunicorn.conf.py b/gunicorn.conf.py index 4d85fa2b6c0..db570401d17 100644 --- a/gunicorn.conf.py +++ b/gunicorn.conf.py @@ -17,7 +17,7 @@ pidfile = '.gunicorn.pid' # Gunicorn recommends 2-4 x number_of_cpu_cores, but # you'll want to vary this a bit to find the best for your # particular work load. -workers = 1 +workers = 4 # Some application-wide initialization is needed. on_starting = openerp.wsgi.on_starting diff --git a/openerp/tests/addons/test_limits/models.py b/openerp/tests/addons/test_limits/models.py index 435e93811fc..5240acd23ab 100644 --- a/openerp/tests/addons/test_limits/models.py +++ b/openerp/tests/addons/test_limits/models.py @@ -20,7 +20,6 @@ class m(openerp.osv.osv.Model): if not hasattr(self, 'l'): self.l = [] self.l.append([0] * size) - print ">>>", len(self.l) return True def consume_time(self, cr, uid, seconds, context=None): @@ -31,13 +30,9 @@ class m(openerp.osv.osv.Model): import os t0 = time.clock() t1 = time.clock() -# try: while t1 - t0 < seconds: - print "[%s] ..." % os.getpid() for i in xrange(10000000): x = i * i t1 = time.clock() -# except Exception, e: -# print "+++", e return True # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/wsgi.py b/openerp/wsgi.py index ed03ed9bc6c..7d47cdb7bb6 100644 --- a/openerp/wsgi.py +++ b/openerp/wsgi.py @@ -490,7 +490,6 @@ def pre_request(worker, req): # VMS and RLIMIT_AS are the same thing: virtual memory, a.k.a. address space rss, vms = psutil.Process(os.getpid()).get_memory_info() soft, hard = resource.getrlimit(resource.RLIMIT_AS) - print ">>>>>> [%s] %s %s %s %s %s" % (os.getpid(), vms, req.method, req.path, req.query, req.fragment) resource.setrlimit(resource.RLIMIT_AS, (config['virtual_memory_limit'], hard)) r = resource.getrusage(resource.RUSAGE_SELF) @@ -505,7 +504,8 @@ def post_request(worker, req, environ): import psutil rss, vms = psutil.Process(os.getpid()).get_memory_info() if vms > config['virtual_memory_reset']: - print ">>> Worker eating too much memory, reset it after the request." + logging.getLogger('wsgi.worker').info('Virtual memory consumption ' + 'too high, rebooting the worker.') worker.alive = False # Commit suicide after the request. # Our signal handler will signal a SGIQUIT to all workers. @@ -516,10 +516,8 @@ def make_winch_handler(server): # SIGXCPU (exceeded CPU time) signal handler will raise an exception. def time_expired(n, stack): - import os - import time - print '>>> [%s] time ran out.' % (os.getpid()) - raise Exception('(time ran out)') # TODO one of openerp.exception + logging.getLogger('wsgi.worker').info('CPU time limit exceeded.') + raise Exception('CPU time limit exceeded.') # TODO one of openerp.exception # Kill gracefuly the workers (e.g. because we want to clear their cache). # This is done by signaling a SIGWINCH to the master process, so it can be From 7d22e1eb8cf4058b923300e8e85c0375696460a2 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 23 Jan 2012 00:32:02 +0100 Subject: [PATCH 18/19] [FIX] revert html_template is used by other modules. commit 2012 revid:nicolas.vanhoren@openerp.com-20120118161735-2yuxisndfq92ctoi bzr revid: al@openerp.com-20120122233202-moq81q35qddjtlw8 --- Makefile | 3 +++ addons/web/controllers/main.html | 21 --------------------- addons/web/controllers/main.py | 22 +++++++++++++++++++--- addons/web/static/src/js/chrome.js | 1 + 4 files changed, 23 insertions(+), 24 deletions(-) delete mode 100644 addons/web/controllers/main.html diff --git a/Makefile b/Makefile index 9e84e356aaf..4beb20d3eed 100644 --- a/Makefile +++ b/Makefile @@ -29,3 +29,6 @@ doc: cloc: cloc addons/*/common/*.py addons/*/controllers/*.py addons/*/static/src/*.js addons/*/static/src/js/*.js addons/*/static/src/css/*.css addons/*/static/src/xml/*.xml +blamestat: + echo addons/*/common/*.py addons/*/controllers/*.py addons/*/static/src/js/*.js addons/*/static/src/css/*.css addons/*/static/src/xml/*.xml | xargs -t -n 1 bzr blame -v --long --all | awk '{print $2}' | sort | uniq -c | sort -n + diff --git a/addons/web/controllers/main.html b/addons/web/controllers/main.html deleted file mode 100644 index fd0be5ba349..00000000000 --- a/addons/web/controllers/main.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - OpenERP - - %(css)s - %(js)s - - - - - - \ No newline at end of file diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 7f5b43ba671..7844897c047 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -84,9 +84,24 @@ def concat_files(file_list, reader=None, intersperse=""): files_concat = intersperse.join(files_content) return files_concat,files_timestamp -html_template = None -with open(os.path.join(os.path.dirname(os.path.abspath(__file__)), "main.html")) as html_file: - html_template = html_file.read() +html_template = """ + + + + OpenERP + + %(css)s + %(js)s + + + + +""" class WebClient(openerpweb.Controller): _cp_path = "/web/webclient" @@ -192,6 +207,7 @@ class WebClient(openerpweb.Controller): 'js': js, 'css': css, 'modules': simplejson.dumps(self.server_wide_modules(req)), + 'init': 'new s.web.WebClient().start();', } return r diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 06fcf518002..b8ee62c3749 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1061,6 +1061,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie }, start: function() { var self = this; + this.$element = $(document.body); if (jQuery.param != undefined && jQuery.deparam(jQuery.param.querystring()).kitten != undefined) { this.$element.addClass("kitten-mode-activated"); this.$element.delegate('img.oe-record-edit-link-img', 'hover', function(e) { From 8ffb0a310fec4935d007b568fb798d57b81c44ae Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Mon, 23 Jan 2012 05:20:51 +0000 Subject: [PATCH 19/19] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20120121054148-0jtsy55iwkhewr4r bzr revid: launchpad_translations_on_behalf_of_openerp-20120122053059-j2aa26epvk6o1s3o bzr revid: launchpad_translations_on_behalf_of_openerp-20120123052051-qlxloap8u2xcv0fa --- addons/account/i18n/de.po | 10 +- addons/account/i18n/gl.po | 10 +- addons/auction/i18n/gl.po | 14 +- addons/base_calendar/i18n/nl.po | 44 ++--- addons/base_contact/i18n/nl.po | 36 ++-- addons/base_contact/i18n/sr@latin.po | 54 +++--- addons/base_iban/i18n/sr@latin.po | 19 +- addons/base_module_quality/i18n/nl.po | 24 +-- addons/base_module_quality/i18n/sr@latin.po | 150 ++++++++------- addons/base_setup/i18n/ru.po | 33 ++-- addons/crm/i18n/nl.po | 49 ++--- addons/crm_caldav/i18n/nl.po | 10 +- addons/crm_claim/i18n/nl.po | 11 +- addons/crm_fundraising/i18n/nl.po | 38 ++-- addons/crm_helpdesk/i18n/nl.po | 48 ++--- addons/crm_partner_assign/i18n/nl.po | 95 +++++----- addons/crm_profiling/i18n/nl.po | 17 +- addons/delivery/i18n/nl.po | 65 ++++--- addons/document/i18n/nl.po | 33 ++-- addons/hr_payroll/i18n/nl.po | 87 ++++----- addons/point_of_sale/i18n/de.po | 191 ++++++++++++-------- addons/stock/i18n/de.po | 9 +- 22 files changed, 578 insertions(+), 469 deletions(-) diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po index a7814d4d0e1..82d150b5eb2 100644 --- a/addons/account/i18n/de.po +++ b/addons/account/i18n/de.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-23 09:55+0000\n" -"PO-Revision-Date: 2012-01-14 10:39+0000\n" +"PO-Revision-Date: 2012-01-22 10:03+0000\n" "Last-Translator: Ferdinand @ Camptocamp \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: 2012-01-15 05:20+0000\n" -"X-Generator: Launchpad (build 14664)\n" +"X-Launchpad-Export-Date: 2012-01-23 05:20+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: account #: view:account.invoice.report:0 @@ -4780,7 +4780,7 @@ msgstr "Steuer Anwendung" #: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale #, python-format msgid "Journal Items" -msgstr "Buchungsjournale" +msgstr "Journal Zeilen" #. module: account #: code:addons/account/account.py:1087 @@ -6869,7 +6869,7 @@ msgstr "" #: model:ir.ui.menu,name:account.menu_action_move_journal_line_form #: model:ir.ui.menu,name:account.menu_finance_entries msgid "Journal Entries" -msgstr "Buchungssätze" +msgstr "Buchungsbelege" #. module: account #: help:account.partner.ledger,page_split:0 diff --git a/addons/account/i18n/gl.po b/addons/account/i18n/gl.po index e8f0188b645..189909fddf2 100644 --- a/addons/account/i18n/gl.po +++ b/addons/account/i18n/gl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-23 09:55+0000\n" -"PO-Revision-Date: 2011-11-07 12:52+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2012-01-22 12:25+0000\n" +"Last-Translator: Xosé \n" "Language-Team: Galician \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-24 05:45+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-23 05:20+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: account #: view:account.invoice.report:0 @@ -2040,7 +2040,7 @@ msgstr "Importar dende factura" #: selection:report.account.sales,month:0 #: selection:report.account_type.sales,month:0 msgid "January" -msgstr "Enero" +msgstr "Xaneiro" #. module: account #: view:account.journal:0 diff --git a/addons/auction/i18n/gl.po b/addons/auction/i18n/gl.po index 1592d54d902..54110c2e41b 100644 --- a/addons/auction/i18n/gl.po +++ b/addons/auction/i18n/gl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-05-09 08:15+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-01-22 12:23+0000\n" +"Last-Translator: Xosé \n" "Language-Team: Galician \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 06:58+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-23 05:20+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: auction #: model:ir.ui.menu,name:auction.auction_report_menu @@ -1829,17 +1829,17 @@ msgstr "Estimación" #. module: auction #: view:auction.taken:0 msgid "OK" -msgstr "Ok" +msgstr "Aceptar" #. module: auction #: model:ir.actions.report.xml,name:auction.buyer_form_id msgid "Buyer Form" -msgstr "Formulario comprador" +msgstr "Formulario do comprador" #. module: auction #: field:auction.bid,partner_id:0 msgid "Buyer Name" -msgstr "Nome comprador" +msgstr "Nome do comprador" #. module: auction #: view:report.auction:0 diff --git a/addons/base_calendar/i18n/nl.po b/addons/base_calendar/i18n/nl.po index 1a39f693914..c6047765485 100644 --- a/addons/base_calendar/i18n/nl.po +++ b/addons/base_calendar/i18n/nl.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-14 08:16+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) \n" +"PO-Revision-Date: 2012-01-21 18:25+0000\n" +"Last-Translator: Erwin \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:22+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-22 05:30+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: base_calendar #: view:calendar.attendee:0 msgid "Invitation Type" -msgstr "" +msgstr "Uitnodiging type" #. module: base_calendar #: selection:calendar.alarm,trigger_related:0 @@ -31,7 +31,7 @@ msgstr "De gebeurtenis begint" #. module: base_calendar #: view:calendar.attendee:0 msgid "Declined Invitations" -msgstr "" +msgstr "Geweigerde uitnodigingen" #. module: base_calendar #: help:calendar.event,exdate:0 @@ -63,7 +63,7 @@ msgstr "Maandelijks" #. module: base_calendar #: selection:calendar.attendee,cutype:0 msgid "Unknown" -msgstr "" +msgstr "Onbekend" #. module: base_calendar #: view:calendar.attendee:0 @@ -115,7 +115,7 @@ msgstr "vierde" #: code:addons/base_calendar/base_calendar.py:1006 #, python-format msgid "Count cannot be negative" -msgstr "" +msgstr "telling kan niet negatief zijn" #. module: base_calendar #: field:calendar.event,day:0 @@ -238,7 +238,7 @@ msgstr "Zaal" #. module: base_calendar #: view:calendar.attendee:0 msgid "Accepted Invitations" -msgstr "" +msgstr "Geaccepteerde uitnodigingen" #. module: base_calendar #: selection:calendar.alarm,trigger_interval:0 @@ -268,7 +268,7 @@ msgstr "Werkwijze" #: code:addons/base_calendar/base_calendar.py:1004 #, python-format msgid "Interval cannot be negative" -msgstr "" +msgstr "Interval kan niet negatief zijn" #. module: base_calendar #: selection:calendar.event,state:0 @@ -280,7 +280,7 @@ msgstr "Geannuleerd" #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143 #, python-format msgid "%s must have an email address to send mail" -msgstr "" +msgstr "%s moet een e-mail adres hebben om e-mail te kunnen verzenden" #. module: base_calendar #: selection:calendar.alarm,trigger_interval:0 @@ -419,6 +419,8 @@ msgstr "Deelnemers" #, python-format msgid "Group by date not supported, use the calendar view instead" msgstr "" +"Groepeer op datum wordt niet ondersteund, gebruik hiervoor de kalender " +"weergave" #. module: base_calendar #: view:calendar.event:0 @@ -468,7 +470,7 @@ msgstr "Plaats" #: selection:calendar.event,class:0 #: selection:calendar.todo,class:0 msgid "Public for Employees" -msgstr "" +msgstr "Openbaar voor werknemers" #. module: base_calendar #: field:base_calendar.invite.attendee,send_mail:0 @@ -567,7 +569,7 @@ msgstr "Toegewezen aan" #. module: base_calendar #: view:calendar.event:0 msgid "To" -msgstr "" +msgstr "Aan" #. module: base_calendar #: view:calendar.attendee:0 @@ -588,7 +590,7 @@ msgstr "Aangemaakt" #. module: base_calendar #: sql_constraint:ir.model:0 msgid "Each model must be unique!" -msgstr "" +msgstr "Ieder model moet uniek zijn!" #. module: base_calendar #: selection:calendar.event,rrule_type:0 @@ -775,7 +777,7 @@ msgstr "Lid" #. module: base_calendar #: view:calendar.event:0 msgid "From" -msgstr "" +msgstr "Van" #. module: base_calendar #: field:calendar.event,rrule:0 @@ -858,7 +860,7 @@ msgstr "Maandag" #. module: base_calendar #: model:ir.model,name:base_calendar.model_ir_model msgid "Models" -msgstr "" +msgstr "Modellen" #. module: base_calendar #: selection:calendar.event,month_list:0 @@ -877,7 +879,7 @@ msgstr "Datum gebeurtenis" #: selection:calendar.event,end_type:0 #: selection:calendar.todo,end_type:0 msgid "Number of repetitions" -msgstr "" +msgstr "Aantal herhalingen" #. module: base_calendar #: view:calendar.event:0 @@ -921,7 +923,7 @@ msgstr "Data" #: field:calendar.event,end_type:0 #: field:calendar.todo,end_type:0 msgid "Recurrence termination" -msgstr "" +msgstr "Herhaling beëindiging" #. module: base_calendar #: field:calendar.event,mo:0 @@ -932,7 +934,7 @@ msgstr "Maa" #. module: base_calendar #: view:calendar.attendee:0 msgid "Invitations To Review" -msgstr "" +msgstr "Te herziene uitnodigingen" #. module: base_calendar #: selection:calendar.event,month_list:0 @@ -966,7 +968,7 @@ msgstr "Januari" #. module: base_calendar #: view:calendar.attendee:0 msgid "Delegated Invitations" -msgstr "" +msgstr "Gedelegeerde uitnodigingen" #. module: base_calendar #: field:calendar.alarm,trigger_interval:0 @@ -1254,7 +1256,7 @@ msgstr "Personen uitnodigen" #. module: base_calendar #: view:calendar.event:0 msgid "Confirmed Events" -msgstr "" +msgstr "Bevestigde evenementen" #. module: base_calendar #: field:calendar.attendee,dir:0 diff --git a/addons/base_contact/i18n/nl.po b/addons/base_contact/i18n/nl.po index 30b90f7699d..516c3973b12 100644 --- a/addons/base_contact/i18n/nl.po +++ b/addons/base_contact/i18n/nl.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-13 06:49+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) \n" +"PO-Revision-Date: 2012-01-21 18:28+0000\n" +"Last-Translator: Erwin \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-12-23 06:02+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-22 05:30+0000\n" +"X-Generator: Launchpad (build 14700)\n" #~ msgid "Categories" #~ msgstr "Categorieën" @@ -22,12 +22,12 @@ msgstr "" #. module: base_contact #: field:res.partner.location,city:0 msgid "City" -msgstr "" +msgstr "Stad" #. module: base_contact #: view:res.partner.contact:0 msgid "First/Lastname" -msgstr "" +msgstr "Voornaam/achternaam" #. module: base_contact #: model:ir.actions.act_window,name:base_contact.action_partner_contact_form @@ -41,7 +41,7 @@ msgstr "Contactpersonen" #. module: base_contact #: view:res.partner.contact:0 msgid "Professional Info" -msgstr "" +msgstr "Professionele info" #. module: base_contact #: field:res.partner.contact,first_name:0 @@ -51,7 +51,7 @@ msgstr "Voornaam" #. module: base_contact #: field:res.partner.address,location_id:0 msgid "Location" -msgstr "" +msgstr "Locatie" #. module: base_contact #: model:process.transition,name:base_contact.process_transition_partnertoaddress0 @@ -75,17 +75,17 @@ msgstr "Website" #. module: base_contact #: field:res.partner.location,zip:0 msgid "Zip" -msgstr "" +msgstr "Postcode" #. module: base_contact #: field:res.partner.location,state_id:0 msgid "Fed. State" -msgstr "" +msgstr "Provincie" #. module: base_contact #: field:res.partner.location,company_id:0 msgid "Company" -msgstr "" +msgstr "Bedrijf" #. module: base_contact #: field:res.partner.contact,title:0 @@ -95,7 +95,7 @@ msgstr "Titel" #. module: base_contact #: field:res.partner.location,partner_id:0 msgid "Main Partner" -msgstr "" +msgstr "Hoofd relatie" #. module: base_contact #: model:process.process,name:base_contact.process_process_basecontactprocess0 @@ -151,7 +151,7 @@ msgstr "Mobiel" #. module: base_contact #: field:res.partner.location,country_id:0 msgid "Country" -msgstr "" +msgstr "Land" #. module: base_contact #: view:res.partner.contact:0 @@ -184,7 +184,7 @@ msgstr "Contactpersoon" #. module: base_contact #: model:ir.model,name:base_contact.model_res_partner_location msgid "res.partner.location" -msgstr "" +msgstr "res.partner.location" #. module: base_contact #: model:process.node,note:base_contact.process_node_partners0 @@ -225,7 +225,7 @@ msgstr "Foto" #. module: base_contact #: view:res.partner.location:0 msgid "Locations" -msgstr "" +msgstr "Locaties" #. module: base_contact #: view:res.partner.contact:0 @@ -235,7 +235,7 @@ msgstr "Algemeen" #. module: base_contact #: field:res.partner.location,street:0 msgid "Street" -msgstr "" +msgstr "Adres" #. module: base_contact #: view:res.partner.contact:0 @@ -255,12 +255,12 @@ msgstr "Relatieadressen" #. module: base_contact #: field:res.partner.location,street2:0 msgid "Street2" -msgstr "" +msgstr "Adres 2" #. module: base_contact #: view:res.partner.contact:0 msgid "Personal Information" -msgstr "" +msgstr "Persoonlijke informatie" #. module: base_contact #: field:res.partner.contact,birthdate:0 diff --git a/addons/base_contact/i18n/sr@latin.po b/addons/base_contact/i18n/sr@latin.po index d543cad3747..64808b11a2d 100644 --- a/addons/base_contact/i18n/sr@latin.po +++ b/addons/base_contact/i18n/sr@latin.po @@ -8,24 +8,24 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2010-12-23 15:25+0000\n" -"Last-Translator: Olivier Dony (OpenERP) \n" +"PO-Revision-Date: 2012-01-20 15:52+0000\n" +"Last-Translator: Milan Milosevic \n" "Language-Team: Serbian latin \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 06:02+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-21 05:41+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: base_contact #: field:res.partner.location,city:0 msgid "City" -msgstr "" +msgstr "Grad" #. module: base_contact #: view:res.partner.contact:0 msgid "First/Lastname" -msgstr "" +msgstr "Ime/prezime" #. module: base_contact #: model:ir.actions.act_window,name:base_contact.action_partner_contact_form @@ -39,7 +39,7 @@ msgstr "Kontakti" #. module: base_contact #: view:res.partner.contact:0 msgid "Professional Info" -msgstr "" +msgstr "Profesionlne informacije" #. module: base_contact #: field:res.partner.contact,first_name:0 @@ -49,7 +49,7 @@ msgstr "Ime" #. module: base_contact #: field:res.partner.address,location_id:0 msgid "Location" -msgstr "" +msgstr "Mesto" #. module: base_contact #: model:process.transition,name:base_contact.process_transition_partnertoaddress0 @@ -62,6 +62,8 @@ msgid "" "If the active field is set to False, it will allow you to " "hide the partner contact without removing it." msgstr "" +"Ako je aktivno polje podešeno na ''Lažno'' (false), omogućiće Vam da " +"sakrijete partnera a da ga ne izbrišete." #. module: base_contact #: field:res.partner.contact,website:0 @@ -71,17 +73,17 @@ msgstr "Internet stranica" #. module: base_contact #: field:res.partner.location,zip:0 msgid "Zip" -msgstr "" +msgstr "Poštanski broj" #. module: base_contact #: field:res.partner.location,state_id:0 msgid "Fed. State" -msgstr "" +msgstr "Federalna država" #. module: base_contact #: field:res.partner.location,company_id:0 msgid "Company" -msgstr "" +msgstr "Preduzeće" #. module: base_contact #: field:res.partner.contact,title:0 @@ -91,17 +93,17 @@ msgstr "Naslov" #. module: base_contact #: field:res.partner.location,partner_id:0 msgid "Main Partner" -msgstr "" +msgstr "Glavni partner" #. module: base_contact #: model:process.process,name:base_contact.process_process_basecontactprocess0 msgid "Base Contact" -msgstr "Osnovni Kontakt" +msgstr "Osnovni kontakt" #. module: base_contact #: field:res.partner.contact,email:0 msgid "E-Mail" -msgstr "E-Mail" +msgstr "E‑pošta:" #. module: base_contact #: field:res.partner.contact,active:0 @@ -122,12 +124,12 @@ msgstr "Postanska adresa" #. module: base_contact #: field:res.partner.contact,function:0 msgid "Main Function" -msgstr "Glavna Funkcija" +msgstr "Glavna funkcija" #. module: base_contact #: model:process.transition,note:base_contact.process_transition_partnertoaddress0 msgid "Define partners and their addresses." -msgstr "Definisi Partnere i njihove Adrese" +msgstr "Definiši partnere i njihove adrese" #. module: base_contact #: field:res.partner.contact,name:0 @@ -147,7 +149,7 @@ msgstr "Mobilni" #. module: base_contact #: field:res.partner.location,country_id:0 msgid "Country" -msgstr "" +msgstr "Država" #. module: base_contact #: view:res.partner.contact:0 @@ -169,7 +171,7 @@ msgstr "Dodatne informacije" #: view:res.partner.contact:0 #: field:res.partner.contact,job_ids:0 msgid "Functions and Addresses" -msgstr "Funkcije i Adrese" +msgstr "Funkcije i adrese" #. module: base_contact #: model:ir.model,name:base_contact.model_res_partner_contact @@ -180,17 +182,17 @@ msgstr "Kontakt" #. module: base_contact #: model:ir.model,name:base_contact.model_res_partner_location msgid "res.partner.location" -msgstr "" +msgstr "res.partner.location" #. module: base_contact #: model:process.node,note:base_contact.process_node_partners0 msgid "Companies you work with." -msgstr "Kompanije s kojima radite." +msgstr "Preduzeća s kojima radite." #. module: base_contact #: field:res.partner.contact,partner_id:0 msgid "Main Employer" -msgstr "Glavni Poslodavac." +msgstr "Glavni poslodavac" #. module: base_contact #: view:res.partner.contact:0 @@ -205,7 +207,7 @@ msgstr "Adrese" #. module: base_contact #: model:process.node,note:base_contact.process_node_addresses0 msgid "Working and private addresses." -msgstr "Rad na Privatnoj adresi" +msgstr "Adrese na radu i privatne adrese." #. module: base_contact #: field:res.partner.contact,last_name:0 @@ -221,7 +223,7 @@ msgstr "Fotografija" #. module: base_contact #: view:res.partner.location:0 msgid "Locations" -msgstr "" +msgstr "Mesta" #. module: base_contact #: view:res.partner.contact:0 @@ -231,7 +233,7 @@ msgstr "Opšte" #. module: base_contact #: field:res.partner.location,street:0 msgid "Street" -msgstr "" +msgstr "Ulica" #. module: base_contact #: view:res.partner.contact:0 @@ -251,12 +253,12 @@ msgstr "Partnerove adrese" #. module: base_contact #: field:res.partner.location,street2:0 msgid "Street2" -msgstr "" +msgstr "Ulica2" #. module: base_contact #: view:res.partner.contact:0 msgid "Personal Information" -msgstr "" +msgstr "Lični podaci" #. module: base_contact #: field:res.partner.contact,birthdate:0 diff --git a/addons/base_iban/i18n/sr@latin.po b/addons/base_iban/i18n/sr@latin.po index 9d277f123ad..d0b8b938c0f 100644 --- a/addons/base_iban/i18n/sr@latin.po +++ b/addons/base_iban/i18n/sr@latin.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-10-05 13:32+0000\n" +"PO-Revision-Date: 2012-01-20 15:40+0000\n" "Last-Translator: Milan Milosevic \n" "Language-Team: Serbian latin \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 05:50+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-21 05:41+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: base_iban #: constraint:res.partner.bank:0 @@ -24,21 +24,24 @@ msgid "" "Please define BIC/Swift code on bank for bank type IBAN Account to make " "valid payments" msgstr "" +"\n" +"Molimo definišite BIC/Swift kod banke za tip IBAN račun za izvršenje " +"validnih uplata/isplata." #. module: base_iban #: model:res.partner.bank.type,format_layout:base_iban.bank_iban msgid "%(bank_name)s: IBAN %(acc_number)s - BIC %(bank_bic)s" -msgstr "" +msgstr "%(bank_name)s: IBAN %(acc_number)s - BIC %(bank_bic)s" #. module: base_iban #: model:res.partner.bank.type.field,name:base_iban.bank_swift_field msgid "bank_bic" -msgstr "" +msgstr "bank_bic" #. module: base_iban #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field msgid "zip" -msgstr "Pošt. Broj" +msgstr "poštanski broj" #. module: base_iban #: help:res.partner.bank,iban:0 @@ -61,7 +64,7 @@ msgstr "country_id" msgid "" "The IBAN does not seem to be correct. You should have entered something like " "this %s" -msgstr "" +msgstr "IBAN izgleda nije tačan. Trebalo je uneti nešto kao %s" #. module: base_iban #: field:res.partner.bank,iban:0 @@ -72,7 +75,7 @@ msgstr "IBAN" #: code:addons/base_iban/base_iban.py:131 #, python-format msgid "The IBAN is invalid, it should begin with the country code" -msgstr "" +msgstr "IBAN je neispravan, trebalo bi da počinje sa kodom države" #. module: base_iban #: model:res.partner.bank.type,name:base_iban.bank_iban diff --git a/addons/base_module_quality/i18n/nl.po b/addons/base_module_quality/i18n/nl.po index ae410817030..38d450a5c61 100644 --- a/addons/base_module_quality/i18n/nl.po +++ b/addons/base_module_quality/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-12 18:47+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2012-01-21 18:30+0000\n" +"Last-Translator: Erwin \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:12+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-22 05:30+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: base_module_quality #: code:addons/base_module_quality/object_test/object_test.py:187 @@ -29,7 +29,7 @@ msgstr "Suggestie" #: model:ir.actions.act_window,name:base_module_quality.action_view_quality_save_report #: view:save.report:0 msgid "Standard Entries" -msgstr "" +msgstr "Standard Entries" #. module: base_module_quality #: code:addons/base_module_quality/base_module_quality.py:100 @@ -57,7 +57,7 @@ msgstr "" #. module: base_module_quality #: view:save.report:0 msgid " " -msgstr "" +msgstr " " #. module: base_module_quality #: selection:module.quality.detail,state:0 @@ -79,7 +79,7 @@ msgstr "Snelheid test" #. module: base_module_quality #: model:ir.model,name:base_module_quality.model_quality_check msgid "Module Quality Check" -msgstr "" +msgstr "Module kwaliteitscontrole" #. module: base_module_quality #: code:addons/base_module_quality/method_test/method_test.py:82 @@ -191,7 +191,7 @@ msgstr "Unit test" #. module: base_module_quality #: view:quality.check:0 msgid "Check" -msgstr "" +msgstr "Controleer" #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:151 @@ -296,7 +296,7 @@ msgstr "Resultaat in %" #. module: base_module_quality #: view:quality.check:0 msgid "This wizard will check module(s) quality" -msgstr "" +msgstr "Deze wizard zal de module kwaliteit controleren" #. module: base_module_quality #: code:addons/base_module_quality/pep8_test/pep8_test.py:58 @@ -444,7 +444,7 @@ msgstr "Test Is niet geïmplementeerd" #. module: base_module_quality #: model:ir.model,name:base_module_quality.model_save_report msgid "Save Report of Quality" -msgstr "" +msgstr "Sla kwaliteitsrapport op" #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:151 @@ -485,7 +485,7 @@ msgstr "" #: code:addons/base_module_quality/speed_test/speed_test.py:116 #, python-format msgid "Error in Read method: %s" -msgstr "" +msgstr "Fout in lees methode: %s" #. module: base_module_quality #: code:addons/base_module_quality/workflow_test/workflow_test.py:129 @@ -506,7 +506,7 @@ msgstr "Annuleren" #. module: base_module_quality #: view:save.report:0 msgid "Close" -msgstr "" +msgstr "Afsluiten" #. module: base_module_quality #: code:addons/base_module_quality/pep8_test/pep8_test.py:32 diff --git a/addons/base_module_quality/i18n/sr@latin.po b/addons/base_module_quality/i18n/sr@latin.po index 1c00709d73e..92427d11dc3 100644 --- a/addons/base_module_quality/i18n/sr@latin.po +++ b/addons/base_module_quality/i18n/sr@latin.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2010-12-23 15:34+0000\n" -"Last-Translator: Olivier Dony (OpenERP) \n" +"PO-Revision-Date: 2012-01-20 15:50+0000\n" +"Last-Translator: Milan Milosevic \n" "Language-Team: Serbian latin \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:13+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-21 05:41+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: base_module_quality #: code:addons/base_module_quality/object_test/object_test.py:187 @@ -29,19 +29,19 @@ msgstr "Predlog" #: model:ir.actions.act_window,name:base_module_quality.action_view_quality_save_report #: view:save.report:0 msgid "Standard Entries" -msgstr "" +msgstr "Standardni unosi" #. module: base_module_quality #: code:addons/base_module_quality/base_module_quality.py:100 #, python-format msgid "Programming Error" -msgstr "Greska Programiranja" +msgstr "Greška programiranja" #. module: base_module_quality #: code:addons/base_module_quality/method_test/method_test.py:31 #, python-format msgid "Method Test" -msgstr "Testiraj Metodu" +msgstr "Testiraj metod" #. module: base_module_quality #: code:addons/base_module_quality/object_test/object_test.py:34 @@ -50,11 +50,13 @@ msgid "" "\n" "Test checks for fields, views, security rules, dependancy level\n" msgstr "" +"\n" +"Test za polja, preglede, pravila sigurnosti, nivo zavisnosti\n" #. module: base_module_quality #: view:save.report:0 msgid " " -msgstr "" +msgstr " " #. module: base_module_quality #: selection:module.quality.detail,state:0 @@ -71,12 +73,12 @@ msgstr "Modul nema ni jedan objekat" #: code:addons/base_module_quality/speed_test/speed_test.py:49 #, python-format msgid "Speed Test" -msgstr "Test Brzine" +msgstr "Test brzine" #. module: base_module_quality #: model:ir.model,name:base_module_quality.model_quality_check msgid "Module Quality Check" -msgstr "" +msgstr "Provera kvaliteta modula" #. module: base_module_quality #: code:addons/base_module_quality/method_test/method_test.py:82 @@ -89,7 +91,7 @@ msgstr "" #: code:addons/base_module_quality/workflow_test/workflow_test.py:143 #, python-format msgid "Object Name" -msgstr "Ime Objekta" +msgstr "Ime stavke" #. module: base_module_quality #: code:addons/base_module_quality/method_test/method_test.py:54 @@ -97,7 +99,7 @@ msgstr "Ime Objekta" #: code:addons/base_module_quality/method_test/method_test.py:68 #, python-format msgid "Ok" -msgstr "U redu" +msgstr "OK" #. module: base_module_quality #: code:addons/base_module_quality/terp_test/terp_test.py:34 @@ -106,14 +108,14 @@ msgid "" "This test checks if the module satisfies the current coding standard used by " "OpenERP." msgstr "" -"Ovo proverava da li modul zadovljava dato kodne standarde koje OpenERP " -"koristi." +"Ovaj test proverava da li modul zadovljava trenutne standarde kodiranja koje " +"OpenERP koristi." #. module: base_module_quality #: code:addons/base_module_quality/wizard/quality_save_report.py:39 #, python-format msgid "No report to save!" -msgstr "Nema Izvestaja za cuvanje!" +msgstr "Nema izveštaja koji bi se sačuvao!" #. module: base_module_quality #: code:addons/base_module_quality/object_test/object_test.py:177 @@ -140,18 +142,18 @@ msgstr "Rezultat (/10)" #: code:addons/base_module_quality/terp_test/terp_test.py:33 #, python-format msgid "Terp Test" -msgstr "Terp Test" +msgstr "Testiraj Terp" #. module: base_module_quality #: code:addons/base_module_quality/object_test/object_test.py:33 #, python-format msgid "Object Test" -msgstr "Testiraj objekt" +msgstr "Testiraj stavku" #. module: base_module_quality #: view:module.quality.detail:0 msgid "Save Report" -msgstr "Sacuvaj Izvestaj" +msgstr "Sačuvaj izveštaj" #. module: base_module_quality #: code:addons/base_module_quality/wizard/module_quality_check.py:43 @@ -159,13 +161,13 @@ msgstr "Sacuvaj Izvestaj" #: view:quality.check:0 #, python-format msgid "Quality Check" -msgstr "Provera Kvaliteta" +msgstr "Provera kvaliteta" #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:128 #, python-format msgid "Not Efficient" -msgstr "Nije Efikasno" +msgstr "Neefikasno" #. module: base_module_quality #: code:addons/base_module_quality/wizard/quality_save_report.py:39 @@ -183,18 +185,18 @@ msgstr "Povratno o strukturi modula" #: code:addons/base_module_quality/unit_test/unit_test.py:35 #, python-format msgid "Unit Test" -msgstr "Test Jedinice" +msgstr "Test jedinice" #. module: base_module_quality #: view:quality.check:0 msgid "Check" -msgstr "" +msgstr "Proveri" #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:151 #, python-format msgid "Reading Complexity" -msgstr "Citanje Kompleksnosti" +msgstr "Čitanje kompleksnosti" #. module: base_module_quality #: code:addons/base_module_quality/pep8_test/pep8_test.py:267 @@ -211,7 +213,7 @@ msgstr "Stanje" #: code:addons/base_module_quality/unit_test/unit_test.py:50 #, python-format msgid "Module does not have 'unit_test/test.py' file" -msgstr "Modul ne sadrzi 'unit_test/test.py' fajl" +msgstr "Modul nema 'unit_test/test.py' datoteku" #. module: base_module_quality #: field:module.quality.detail,ponderation:0 @@ -222,7 +224,7 @@ msgstr "Ponderacija" #: code:addons/base_module_quality/object_test/object_test.py:177 #, python-format msgid "Result of Security in %" -msgstr "Bezbedonosni rezultat u %" +msgstr "Rezultati bezbednosti u %" #. module: base_module_quality #: help:module.quality.detail,ponderation:0 @@ -260,18 +262,18 @@ msgstr "Nema podataka" #. module: base_module_quality #: model:ir.model,name:base_module_quality.model_module_quality_detail msgid "module.quality.detail" -msgstr "modul.detalj.kvalitet" +msgstr "module.quality.detail" #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:127 #, python-format msgid "O(n) or worst" -msgstr "O(n) ili losije" +msgstr "O(n) ili lošije" #. module: base_module_quality #: field:save.report,module_file:0 msgid "Save report" -msgstr "Sacuvaj Izvestaj" +msgstr "Sačubvaj izveštaj" #. module: base_module_quality #: code:addons/base_module_quality/workflow_test/workflow_test.py:34 @@ -293,7 +295,7 @@ msgstr "Rezultat u %" #. module: base_module_quality #: view:quality.check:0 msgid "This wizard will check module(s) quality" -msgstr "" +msgstr "Ovaj čarobnjak će proveriti kvalitet modula" #. module: base_module_quality #: code:addons/base_module_quality/pep8_test/pep8_test.py:58 @@ -319,12 +321,12 @@ msgstr "Poruka" #: code:addons/base_module_quality/terp_test/terp_test.py:54 #, python-format msgid "The module does not contain the __openerp__.py file" -msgstr "Ovaj Modul ne sadrzi __openerp__.py fajl" +msgstr "Ovaj modul nema __openerp__.py datoteku." #. module: base_module_quality #: view:module.quality.detail:0 msgid "Detail" -msgstr "Detalji" +msgstr "Detalj" #. module: base_module_quality #: field:module.quality.detail,note:0 @@ -340,27 +342,27 @@ msgid "" "wished.\n" "" msgstr "" -"O(1) podrazumeva da broj SQL zahteva za citanje objekata ne zavisi od " -"broja broja objekata koje citamo. Ova mogucnost je najtrazenija.\n" -"" +"O(1) podrazumeva da broj SQL zahteva za čitanje objekata ne zavisi od " +"broja stavki koje čitamo. Ova mogućnost je najpoželjnija.\n" +" " #. module: base_module_quality #: code:addons/base_module_quality/terp_test/terp_test.py:120 #, python-format msgid "__openerp__.py file" -msgstr "__openerp__.py fajl" +msgstr "__openerp__.py datoteka" #. module: base_module_quality #: code:addons/base_module_quality/unit_test/unit_test.py:70 #, python-format msgid "Status" -msgstr "Status" +msgstr "Stanje" #. module: base_module_quality #: view:module.quality.check:0 #: field:module.quality.check,check_detail_ids:0 msgid "Tests" -msgstr "Probe" +msgstr "Testiranja" #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:50 @@ -371,12 +373,16 @@ msgid "" "needed in order to run it.\n" "\n" msgstr "" +"\n" +"Ovaj test proverava brzinu modula. Zapazite da je potrebno najmanje 5 demo " +"podataka da bi se mogao pokrenuti.\n" +"\n" #. module: base_module_quality #: code:addons/base_module_quality/pylint_test/pylint_test.py:71 #, python-format msgid "Unable to parse the result. Check the details." -msgstr "Rezultat se ne moze uporedjivati. Proveri detalje." +msgstr "Rezultat se ne moze upoređivati. Proverite detalje." #. module: base_module_quality #: code:addons/base_module_quality/structure_test/structure_test.py:33 @@ -385,31 +391,33 @@ msgid "" "\n" "This test checks if the module satisfy tiny structure\n" msgstr "" +"\n" +"Ovaj test proverava da li modul ispunjava strukturu ''najmanje''\n" #. module: base_module_quality #: code:addons/base_module_quality/structure_test/structure_test.py:151 #: code:addons/base_module_quality/workflow_test/workflow_test.py:136 #, python-format msgid "Module Name" -msgstr "Ime Modula" +msgstr "Naziv Modula" #. module: base_module_quality #: code:addons/base_module_quality/unit_test/unit_test.py:56 #, python-format msgid "Error! Module is not properly loaded/installed" -msgstr "Greska ! Modul nije ispravno ucitan/instaliran" +msgstr "Greška ! Modul nije ispravno učitan/instaliran" #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:115 #, python-format msgid "Error in Read method" -msgstr "Greska u metodi Citanja" +msgstr "Greška u metodi čitanja" #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:138 #, python-format msgid "Score is below than minimal score(%s%%)" -msgstr "Rezultat je ispod minimalnoig rezultata (%s%%)" +msgstr "Rezultat je ispod minimalnog rezultata (%s%%)" #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:151 @@ -429,12 +437,12 @@ msgstr "Izuzetak" #: code:addons/base_module_quality/base_module_quality.py:100 #, python-format msgid "Test Is Not Implemented" -msgstr "Tset NIJE Implementiran" +msgstr "Test NIJE Implementiran" #. module: base_module_quality #: model:ir.model,name:base_module_quality.model_save_report msgid "Save Report of Quality" -msgstr "" +msgstr "Sačuvaj izveštaj o kvalitetu" #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:151 @@ -446,7 +454,7 @@ msgstr "N" #: code:addons/base_module_quality/workflow_test/workflow_test.py:143 #, python-format msgid "Feed back About Workflow of Module" -msgstr "Povratna informacija o prezasicenosti Modula" +msgstr "Povratna informacija o prezasićenosti modula" #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:73 @@ -455,8 +463,8 @@ msgid "" "Given module has no objects.Speed test can work only when new objects are " "created in the module along with demo data" msgstr "" -"Dati modul nema objekata. Test brzine moze da radi kada je kreiran novi " -"objekat u modulu zajedno sa demo podacima" +"Dati modul nema stavki. Test brzine može da radi jedino kada se nove stavke " +"naprave u modulu zajedno sa demo podacima" #. module: base_module_quality #: code:addons/base_module_quality/pylint_test/pylint_test.py:32 @@ -466,18 +474,22 @@ msgid "" "of Python. See http://www.logilab.org/project/name/pylint for further info.\n" " " msgstr "" +"Ovaj test koristi Pylint i proverava da li modul zadovoljava standarde " +"kodiranja Python-a. Vidite http://www.logilab.org/project/name/pylint za " +"dodatne informacije.\n" +" " #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:116 #, python-format msgid "Error in Read method: %s" -msgstr "" +msgstr "Greška u metodu čitanja: %s" #. module: base_module_quality #: code:addons/base_module_quality/workflow_test/workflow_test.py:129 #, python-format msgid "No Workflow define" -msgstr "Prezasicenost nije definisana" +msgstr "Prezasićenost nije definisana" #. module: base_module_quality #: selection:module.quality.detail,state:0 @@ -492,7 +504,7 @@ msgstr "Otkaži" #. module: base_module_quality #: view:save.report:0 msgid "Close" -msgstr "" +msgstr "Zatvori" #. module: base_module_quality #: code:addons/base_module_quality/pep8_test/pep8_test.py:32 @@ -501,11 +513,14 @@ msgid "" "\n" "PEP-8 Test , copyright of py files check, method can not call from loops\n" msgstr "" +"\n" +"PEP-8 test, provera copyright-a py datoteka, metod se ne može pokrenuti iz " +"petlji (loops)\n" #. module: base_module_quality #: field:module.quality.check,final_score:0 msgid "Final Score (%)" -msgstr "Krajnji Rezultat (%)" +msgstr "Konačni rezultat (%)" #. module: base_module_quality #: code:addons/base_module_quality/pylint_test/pylint_test.py:61 @@ -513,7 +528,7 @@ msgstr "Krajnji Rezultat (%)" msgid "" "Error. Is pylint correctly installed? (http://pypi.python.org/pypi/pylint)" msgstr "" -"Greska. Da li je pylint ispravno instaliran? " +"Greška. Da li je pylint ispravno instaliran? " "(http://pypi.python.org/pypi/pylint)" #. module: base_module_quality @@ -531,7 +546,7 @@ msgstr "Ocenjen Modul" #: code:addons/base_module_quality/workflow_test/workflow_test.py:33 #, python-format msgid "Workflow Test" -msgstr "Test Prezasicenosti" +msgstr "Test Prezasićenosti" #. module: base_module_quality #: code:addons/base_module_quality/unit_test/unit_test.py:36 @@ -542,6 +557,10 @@ msgid "" "'unit_test/test.py' is needed in module.\n" "\n" msgstr "" +"\n" +"Ovaj test proverava Pojedinačni test slučajeva (PyUnit) za ovaj modul. " +"Zapazite da je neophodno 'unit_test/test.py' u modulu.\n" +"\n" #. module: base_module_quality #: code:addons/base_module_quality/method_test/method_test.py:32 @@ -551,6 +570,9 @@ msgid "" "This test checks if the module classes are raising exception when calling " "basic methods or not.\n" msgstr "" +"\n" +"Ovaj test proverava da li klase modula podižu ili ne očekivanja kada se " +"pokreću osnovne metode.\n" #. module: base_module_quality #: field:module.quality.detail,detail:0 @@ -561,7 +583,7 @@ msgstr "Detalji" #: code:addons/base_module_quality/speed_test/speed_test.py:119 #, python-format msgid "Warning! Not enough demo data" -msgstr "" +msgstr "Upozorenje! Nema dovoljno demo podataka!" #. module: base_module_quality #: code:addons/base_module_quality/pylint_test/pylint_test.py:31 @@ -579,7 +601,7 @@ msgstr "PEP-8 Test" #: code:addons/base_module_quality/object_test/object_test.py:187 #, python-format msgid "Field name" -msgstr "Ime Polja" +msgstr "Ime polja" #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:151 @@ -602,12 +624,12 @@ msgstr "Ime Tag-a" #. module: base_module_quality #: model:ir.model,name:base_module_quality.model_module_quality_check msgid "module.quality.check" -msgstr "modul.provera.kvaliteta" +msgstr "module.quality.check" #. module: base_module_quality #: field:module.quality.detail,name:0 msgid "Name" -msgstr "Ime" +msgstr "Naziv" #. module: base_module_quality #: code:addons/base_module_quality/object_test/object_test.py:177 @@ -624,13 +646,13 @@ msgstr "Rezultat (%)" #. module: base_module_quality #: help:save.report,name:0 msgid "Save report as .html format" -msgstr "Sacuvaj Izvestaj kao .html format" +msgstr "Sačuvaj izveštaj kao .html format" #. module: base_module_quality #: code:addons/base_module_quality/base_module_quality.py:269 #, python-format msgid "The module has to be installed before running this test." -msgstr "Modul treba biti instaliran pre nego pokrenes ovaj test." +msgstr "Modul treba da je instaliran pre pokretanja ovog testa." #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:123 @@ -650,7 +672,7 @@ msgstr "Rezultat polja u %" #: field:module.quality.detail,summary:0 #, python-format msgid "Summary" -msgstr "Sumarno" +msgstr "Sažetak" #. module: base_module_quality #: code:addons/base_module_quality/pylint_test/pylint_test.py:99 @@ -658,19 +680,19 @@ msgstr "Sumarno" #: field:save.report,name:0 #, python-format msgid "File Name" -msgstr "Ime Fajla" +msgstr "Naziv datoteke" #. module: base_module_quality #: code:addons/base_module_quality/pep8_test/pep8_test.py:274 #, python-format msgid "Line number" -msgstr "Broj Linije" +msgstr "Broj linije" #. module: base_module_quality #: code:addons/base_module_quality/structure_test/structure_test.py:32 #, python-format msgid "Structure Test" -msgstr "Test Strukture" +msgstr "Test strukture" #. module: base_module_quality #: field:module.quality.detail,quality_check_id:0 @@ -681,7 +703,7 @@ msgstr "Kvalitet" #: code:addons/base_module_quality/terp_test/terp_test.py:140 #, python-format msgid "Feed back About terp file of Module" -msgstr "Povratni info o terp fajlu Modula" +msgstr "Povratne informacije o terp datoteci modula" #~ msgid "Base module quality - To check the quality of other modules" #~ msgstr "Kvalitet baze modula - Da proveri kvalitet ostalih modula" diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po index 02786282ffb..c0d3274cf86 100644 --- a/addons/base_setup/i18n/ru.po +++ b/addons/base_setup/i18n/ru.po @@ -7,44 +7,44 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-11-07 12:52+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2012-01-20 19:34+0000\n" +"Last-Translator: Chertykov Denis \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-12-23 06:07+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-21 05:41+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: base_setup #: field:user.preferences.config,menu_tips:0 msgid "Display Tips" -msgstr "" +msgstr "Выводить советы" #. module: base_setup #: selection:base.setup.terminology,partner:0 msgid "Guest" -msgstr "" +msgstr "Гость" #. module: base_setup #: model:ir.model,name:base_setup.model_product_installer msgid "product.installer" -msgstr "" +msgstr "product.installer" #. module: base_setup #: selection:product.installer,customers:0 msgid "Create" -msgstr "" +msgstr "Создать" #. module: base_setup #: selection:base.setup.terminology,partner:0 msgid "Member" -msgstr "" +msgstr "Участник" #. module: base_setup #: field:migrade.application.installer.modules,sync_google_contact:0 msgid "Sync Google Contact" -msgstr "" +msgstr "Синхронизировать конакты Google" #. module: base_setup #: help:user.preferences.config,context_tz:0 @@ -56,7 +56,7 @@ msgstr "" #. module: base_setup #: selection:product.installer,customers:0 msgid "Import" -msgstr "" +msgstr "Импорт" #. module: base_setup #: selection:base.setup.terminology,partner:0 @@ -126,6 +126,9 @@ msgid "" "simplified interface, which has less features but is easier. You can always " "switch later from the user preferences." msgstr "" +"Если Вы используете OpenERP первый раз, мы настоятельно советуем выбрать " +"упрощенный интерфейс, который имеет меньше функций, но является более " +"легким. Позже Вы всегда сможете сменить интерфейс в настройках пользователя." #. module: base_setup #: view:base.setup.terminology:0 @@ -136,12 +139,12 @@ msgstr "res_config_contents" #. module: base_setup #: field:user.preferences.config,view:0 msgid "Interface" -msgstr "" +msgstr "Интерфейс" #. module: base_setup #: model:ir.model,name:base_setup.model_migrade_application_installer_modules msgid "migrade.application.installer.modules" -msgstr "" +msgstr "migrade.application.installer.modules" #. module: base_setup #: view:base.setup.terminology:0 @@ -158,12 +161,12 @@ msgstr "" #. module: base_setup #: selection:base.setup.terminology,partner:0 msgid "Customer" -msgstr "" +msgstr "Заказчик" #. module: base_setup #: field:user.preferences.config,context_lang:0 msgid "Language" -msgstr "" +msgstr "Язык" #. module: base_setup #: help:user.preferences.config,context_lang:0 diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po index da7f4d82d59..eed91b75a74 100644 --- a/addons/crm/i18n/nl.po +++ b/addons/crm/i18n/nl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:43+0000\n" -"PO-Revision-Date: 2012-01-19 19:14+0000\n" +"PO-Revision-Date: 2012-01-22 19:00+0000\n" "Last-Translator: Erwin \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: 2012-01-20 04:38+0000\n" +"X-Launchpad-Export-Date: 2012-01-23 05:20+0000\n" "X-Generator: Launchpad (build 14700)\n" #. module: crm @@ -238,7 +238,7 @@ msgstr "Uitschrijven" #. module: crm #: field:crm.meeting,end_type:0 msgid "Recurrence termination" -msgstr "" +msgstr "Herhaling beëindiging" #. module: crm #: code:addons/crm/crm_lead.py:323 @@ -572,7 +572,7 @@ msgstr "E-Mail" #. module: crm #: view:crm.phonecall:0 msgid "Phonecalls during last 7 days" -msgstr "" +msgstr "Telefoongesprekken van de afgelopen 7 dagen" #. module: crm #: selection:crm.lead.report,creation_month:0 @@ -633,7 +633,7 @@ msgstr "Einddatum" #: view:crm.opportunity2phonecall:0 #: view:crm.phonecall2phonecall:0 msgid "Schedule/Log a call" -msgstr "" +msgstr "Plan/Log een gesprek" #. module: crm #: constraint:base.action.rule:0 @@ -1273,7 +1273,7 @@ msgstr "Conditie dossier velden" #. module: crm #: view:crm.phonecall.report:0 msgid "Phone calls which are in pending state" -msgstr "" +msgstr "Telefoongesprekken in de staat 'lopend'" #. module: crm #: view:crm.case.section:0 @@ -1568,7 +1568,7 @@ msgstr "Onderliggende teams" #. module: crm #: view:crm.phonecall.report:0 msgid "Phone calls which are in draft and open state" -msgstr "" +msgstr "Telefoongesprekken in de concept en open fase" #. module: crm #: model:crm.case.resource.type,name:crm.type_lead1 @@ -1602,7 +1602,7 @@ msgstr "res.users" #. module: crm #: view:crm.lead.report:0 msgid "Leads/Opportunities which are in pending state" -msgstr "" +msgstr "Leads/Prospects dien zich in de lopende fase bevinden" #. module: crm #: model:ir.model,name:crm.model_crm_merge_opportunity @@ -1638,7 +1638,7 @@ msgstr "Telefoongesprek categoriën" #. module: crm #: view:crm.lead.report:0 msgid "Leads/Opportunities which are in open state" -msgstr "" +msgstr "Leads/Prospects dien zich in de open fase bevinden" #. module: crm #: model:ir.actions.act_window,name:crm.act_oppor_categ @@ -2140,7 +2140,7 @@ msgstr "Naam contactpersoon" #. module: crm #: view:crm.lead:0 msgid "Leads creating during last 7 days" -msgstr "" +msgstr "Leads aangemaakt in de afgelopen 7 dagen" #. module: crm #: view:crm.phonecall2partner:0 @@ -2209,7 +2209,7 @@ msgstr "Team" #. module: crm #: view:crm.lead.report:0 msgid "Leads/Opportunities which are in New state" -msgstr "" +msgstr "Leads/Prospects dien zich in de nieuw fase bevinden" #. module: crm #: view:crm.phonecall:0 @@ -2233,7 +2233,7 @@ msgstr "Slagingskans" #. module: crm #: view:crm.lead:0 msgid "Pending Opportunities" -msgstr "" +msgstr "Lopende prospects" #. module: crm #: view:crm.lead.report:0 @@ -3066,7 +3066,7 @@ msgstr "Bevestigd" #. module: crm #: model:ir.actions.act_window,name:crm.act_oppor_stage_user msgid "Planned Revenue By User and Stage" -msgstr "" +msgstr "Geplande opbrengst per gebrukier en fase" #. module: crm #: view:crm.meeting:0 @@ -3106,7 +3106,7 @@ msgstr "Dag v/d maand" #. module: crm #: model:ir.actions.act_window,name:crm.act_my_oppor_stage msgid "Planned Revenue By Stage" -msgstr "" +msgstr "Geplande opbrengst per fase" #. module: crm #: selection:crm.add.note,state:0 @@ -3242,7 +3242,7 @@ msgstr "Partner contactpersoon e-mail" #: code:addons/crm/wizard/crm_lead_to_partner.py:48 #, python-format msgid "A partner is already defined." -msgstr "" +msgstr "Een relatie is al gedefinieerd" #. module: crm #: selection:crm.meeting,byday:0 @@ -3464,6 +3464,8 @@ msgstr "Normaal" #, python-format msgid "Closed/Cancelled Leads can not be converted into Opportunity" msgstr "" +"Gesloten/Geannuleerde leads kunnen niet naar een prospect worden " +"geconverteerd" #. module: crm #: model:ir.actions.act_window,name:crm.crm_meeting_categ_action @@ -3534,7 +3536,7 @@ msgstr "De prospect '%s' is gewonnen." #. module: crm #: field:crm.case.stage,case_default:0 msgid "Common to All Teams" -msgstr "" +msgstr "Algemeen voor alle teams" #. module: crm #: code:addons/crm/wizard/crm_add_note.py:28 @@ -3637,7 +3639,7 @@ msgstr "Persoonlijk" #. module: crm #: selection:crm.meeting,class:0 msgid "Public for Employees" -msgstr "" +msgstr "Openbaar voor werknemers" #. module: crm #: field:crm.lead,function:0 @@ -3662,7 +3664,7 @@ msgstr "Omschrijving" #. module: crm #: view:crm.phonecall.report:0 msgid "Phone calls made in current month" -msgstr "" +msgstr "Telefoongesprekken gemaakt in de huidige maand" #. module: crm #: selection:crm.lead.report,creation_month:0 @@ -3686,7 +3688,7 @@ msgstr "Nieuwe prospects" #: code:addons/crm/crm_action_rule.py:61 #, python-format msgid "No E-Mail Found for your Company address!" -msgstr "" +msgstr "Geen e-mail gevonden voor uw bedrijfsadres!" #. module: crm #: field:crm.lead.report,email:0 @@ -3706,7 +3708,7 @@ msgstr "Prospects op gebruiker en team" #. module: crm #: view:crm.phonecall:0 msgid "Reset to Todo" -msgstr "" +msgstr "Zet terug naar Te doen" #. module: crm #: field:crm.case.section,working_hours:0 @@ -3835,6 +3837,10 @@ msgid "" "channels that will be maintained at the creation of a document in the " "system. Some examples of channels can be: Website, Phone Call, Reseller, etc." msgstr "" +"Volg hier waar uw leads en verkoopkansen vandaan komen door specifieke " +"kanalen te maken die worden bijgehouden bij het maken van een document in " +"het systeem, Enkele voorbeelden van kanalen kunnen zijn: Website, " +"Telefonisch, Dealer, etc." #. module: crm #: selection:crm.lead2opportunity.partner,name:0 @@ -3866,7 +3872,7 @@ msgstr "Reeks" #. module: crm #: model:ir.model,name:crm.model_mail_compose_message msgid "E-mail composition wizard" -msgstr "" +msgstr "E-mail opmaak wizard" #. module: crm #: view:crm.meeting:0 @@ -3905,6 +3911,7 @@ msgstr "Jaar" #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." msgstr "" +"Fout! Het is niet mogelijk om recursieve geassocieerde leden te maken" #. module: crm #: model:crm.case.resource.type,name:crm.type_lead8 diff --git a/addons/crm_caldav/i18n/nl.po b/addons/crm_caldav/i18n/nl.po index b7e4f9f870f..129d5ca515e 100644 --- a/addons/crm_caldav/i18n/nl.po +++ b/addons/crm_caldav/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-14 08:51+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) \n" +"PO-Revision-Date: 2012-01-21 19:04+0000\n" +"Last-Translator: Erwin \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:25+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-22 05:30+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: crm_caldav #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse @@ -25,7 +25,7 @@ msgstr "Caldav Browse" #. module: crm_caldav #: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse msgid "Synchronize This Calendar" -msgstr "" +msgstr "Deze agenda synchroniseren" #. module: crm_caldav #: model:ir.model,name:crm_caldav.model_crm_meeting diff --git a/addons/crm_claim/i18n/nl.po b/addons/crm_claim/i18n/nl.po index 56d98318213..b162af86d71 100644 --- a/addons/crm_claim/i18n/nl.po +++ b/addons/crm_claim/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2012-01-18 20:27+0000\n" -"Last-Translator: Erwin (Endian Solutions) \n" +"PO-Revision-Date: 2012-01-22 14:40+0000\n" +"Last-Translator: Erwin \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-19 04:51+0000\n" -"X-Generator: Launchpad (build 14692)\n" +"X-Launchpad-Export-Date: 2012-01-23 05:20+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: crm_claim #: field:crm.claim.report,nbr:0 @@ -475,7 +475,7 @@ msgstr "Juni" #. module: crm_claim #: view:res.partner:0 msgid "Partners Claim" -msgstr "" +msgstr "Relatie claim" #. module: crm_claim #: field:crm.claim,partner_phone:0 @@ -785,6 +785,7 @@ msgstr "ID" #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." msgstr "" +"Fout! Het is niet mogelijk om recursieve geassocieerde leden te maken" #. module: crm_claim #: view:crm.claim:0 diff --git a/addons/crm_fundraising/i18n/nl.po b/addons/crm_fundraising/i18n/nl.po index 2b3acaece4a..fdf7d7ccd36 100644 --- a/addons/crm_fundraising/i18n/nl.po +++ b/addons/crm_fundraising/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-14 08:53+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) \n" +"PO-Revision-Date: 2012-01-21 18:34+0000\n" +"Last-Translator: Erwin \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:19+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-22 05:30+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: crm_fundraising #: field:crm.fundraising,planned_revenue:0 @@ -104,7 +104,7 @@ msgstr "Berichten" #. module: crm_fundraising #: view:crm.fundraising.report:0 msgid "My company" -msgstr "" +msgstr "Mijn bedrijf" #. module: crm_fundraising #: view:crm.fundraising:0 @@ -126,7 +126,7 @@ msgstr "Gesch. omzet" #. module: crm_fundraising #: view:crm.fundraising:0 msgid "Open Funds" -msgstr "" +msgstr "Open fondsen" #. module: crm_fundraising #: field:crm.fundraising,ref:0 @@ -170,7 +170,7 @@ msgstr "Relatie" #. module: crm_fundraising #: view:crm.fundraising.report:0 msgid "Funds raised in current year" -msgstr "" +msgstr "Geworven fondsen dit jaar" #. module: crm_fundraising #: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising @@ -208,7 +208,7 @@ msgstr "" #. module: crm_fundraising #: view:crm.fundraising:0 msgid "Pending Funds" -msgstr "" +msgstr "Lopende fondsen" #. module: crm_fundraising #: view:crm.fundraising:0 @@ -221,7 +221,7 @@ msgstr "Betalingsvorm" #: selection:crm.fundraising,state:0 #: view:crm.fundraising.report:0 msgid "New" -msgstr "" +msgstr "Nieuw" #. module: crm_fundraising #: field:crm.fundraising,email_from:0 @@ -237,7 +237,7 @@ msgstr "Laagste" #: view:crm.fundraising:0 #: view:crm.fundraising.report:0 msgid "My Sales Team(s)" -msgstr "" +msgstr "Mijn verkoop team(s)" #. module: crm_fundraising #: field:crm.fundraising,create_date:0 @@ -307,7 +307,7 @@ msgstr "Aantal dagen om werving af te sluiten" #. module: crm_fundraising #: view:crm.fundraising.report:0 msgid "Funds raised in current month" -msgstr "" +msgstr "Geworven fondsen huidige maand" #. module: crm_fundraising #: view:crm.fundraising:0 @@ -384,7 +384,7 @@ msgstr "Referentie 2" #. module: crm_fundraising #: view:crm.fundraising.report:0 msgid "Funds raised in last month" -msgstr "" +msgstr "Geworven fondsen laatste maand" #. module: crm_fundraising #: view:crm.fundraising:0 @@ -540,7 +540,7 @@ msgstr "Deze personen ontvangen email." #. module: crm_fundraising #: view:crm.fundraising:0 msgid "Fund Category" -msgstr "" +msgstr "Fonds categorie" #. module: crm_fundraising #: field:crm.fundraising,date:0 @@ -565,7 +565,7 @@ msgstr "Contactpersoon relatie" #. module: crm_fundraising #: view:crm.fundraising.report:0 msgid "Month of fundraising" -msgstr "" +msgstr "Maand van fondsverwerving" #. module: crm_fundraising #: view:crm.fundraising:0 @@ -583,7 +583,7 @@ msgstr "Status" #. module: crm_fundraising #: view:crm.fundraising:0 msgid "Unassigned" -msgstr "" +msgstr "Niet toegewezen" #. module: crm_fundraising #: view:crm.fundraising:0 @@ -612,7 +612,7 @@ msgstr "Open" #. module: crm_fundraising #: selection:crm.fundraising,state:0 msgid "In Progress" -msgstr "" +msgstr "In behandeling" #. module: crm_fundraising #: model:ir.actions.act_window,help:crm_fundraising.crm_case_category_act_fund_all1 @@ -653,7 +653,7 @@ msgstr "Beantwoorden" #. module: crm_fundraising #: view:crm.fundraising.report:0 msgid "Date of fundraising" -msgstr "" +msgstr "Datum van fondsverwerving" #. module: crm_fundraising #: view:crm.fundraising.report:0 @@ -669,7 +669,7 @@ msgstr "Betalingsvorm" #. module: crm_fundraising #: view:crm.fundraising:0 msgid "New Funds" -msgstr "" +msgstr "Nieuwe fondsen" #. module: crm_fundraising #: model:ir.actions.act_window,help:crm_fundraising.crm_fundraising_stage_act @@ -744,7 +744,7 @@ msgstr "Fondsen op categorie" #. module: crm_fundraising #: view:crm.fundraising.report:0 msgid "Month-1" -msgstr "" +msgstr "Maand-1" #. module: crm_fundraising #: selection:crm.fundraising.report,month:0 diff --git a/addons/crm_helpdesk/i18n/nl.po b/addons/crm_helpdesk/i18n/nl.po index a6256154df0..c011cc7084c 100644 --- a/addons/crm_helpdesk/i18n/nl.po +++ b/addons/crm_helpdesk/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-14 08:53+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) \n" +"PO-Revision-Date: 2012-01-22 14:38+0000\n" +"Last-Translator: Erwin \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:23+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-23 05:20+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: crm_helpdesk #: field:crm.helpdesk.report,delay_close:0 @@ -46,7 +46,7 @@ msgstr "Maart" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Helpdesk requests occurred in current year" -msgstr "" +msgstr "Helpdesk verzoeken dit jaar" #. module: crm_helpdesk #: field:crm.helpdesk,company_id:0 @@ -80,7 +80,7 @@ msgstr "Toevoegen interne notitie" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Date of helpdesk requests" -msgstr "" +msgstr "Datum van helpdesk verzoek" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -95,7 +95,7 @@ msgstr "Berichten" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "My company" -msgstr "" +msgstr "Mijn bedrijf" #. module: crm_helpdesk #: selection:crm.helpdesk,state:0 @@ -156,7 +156,7 @@ msgstr "Afdeling" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Helpdesk requests occurred in last month" -msgstr "" +msgstr "Helpdesk verzoeken laatste maand" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -166,14 +166,14 @@ msgstr "Verstuur nieuwe email" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "Helpdesk requests during last 7 days" -msgstr "" +msgstr "Helpdesk verzoeken in de afgelopen 7 dagen" #. module: crm_helpdesk #: view:crm.helpdesk:0 #: selection:crm.helpdesk,state:0 #: view:crm.helpdesk.report:0 msgid "New" -msgstr "" +msgstr "Nieuw" #. module: crm_helpdesk #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report @@ -207,7 +207,7 @@ msgstr "# Mails" #: view:crm.helpdesk:0 #: view:crm.helpdesk.report:0 msgid "My Sales Team(s)" -msgstr "" +msgstr "Mijn verkoop team(s)" #. module: crm_helpdesk #: field:crm.helpdesk,create_date:0 @@ -252,7 +252,7 @@ msgstr "Categorieën" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "New Helpdesk Request" -msgstr "" +msgstr "Nieuw helpdesk verzoek" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -267,13 +267,13 @@ msgstr "Data" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Month of helpdesk requests" -msgstr "" +msgstr "Maand van helpdesk verzoek" #. module: crm_helpdesk #: code:addons/crm_helpdesk/crm_helpdesk.py:101 #, python-format msgid "No Subject" -msgstr "" +msgstr "Geen onderwerp" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 @@ -283,12 +283,12 @@ msgstr "#Helpdesk" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "All pending Helpdesk Request" -msgstr "" +msgstr "Alle lopende helpdesk verzoeken" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Year of helpdesk requests" -msgstr "" +msgstr "Jaar van helpdesk verzoek" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -324,7 +324,7 @@ msgstr "Wijzigingsdatum" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Helpdesk requests occurred in current month" -msgstr "" +msgstr "Helpdeskverzoeken van de huidige maand" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 @@ -345,7 +345,7 @@ msgstr "Categorie" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "Responsible User" -msgstr "" +msgstr "Verantwoordelijke gebruiker" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -361,7 +361,7 @@ msgstr "Verwachte kosten" #. module: crm_helpdesk #: help:crm.helpdesk,channel_id:0 msgid "Communication channel." -msgstr "" +msgstr "Communicatiekanaal" #. module: crm_helpdesk #: help:crm.helpdesk,email_cc:0 @@ -575,7 +575,7 @@ msgstr "Helpdesk aanvragen" #. module: crm_helpdesk #: selection:crm.helpdesk,state:0 msgid "In Progress" -msgstr "" +msgstr "In behandeling" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -664,7 +664,7 @@ msgstr "Naam" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Month-1" -msgstr "" +msgstr "Maand-1" #. module: crm_helpdesk #: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main @@ -703,17 +703,17 @@ msgstr "" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "Todays's Helpdesk Requests" -msgstr "" +msgstr "Helpdeskverzoeken van vandaag" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "Request Date" -msgstr "" +msgstr "Aanvraagdatum" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "Open Helpdesk Request" -msgstr "" +msgstr "Open helpdeskverzoeken" #. module: crm_helpdesk #: selection:crm.helpdesk,priority:0 diff --git a/addons/crm_partner_assign/i18n/nl.po b/addons/crm_partner_assign/i18n/nl.po index 9e7e981f4c1..88812ba8bd8 100644 --- a/addons/crm_partner_assign/i18n/nl.po +++ b/addons/crm_partner_assign/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-14 08:55+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) \n" +"PO-Revision-Date: 2012-01-21 19:03+0000\n" +"Last-Translator: Erwin \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:25+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-22 05:30+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,send_to:0 @@ -25,12 +25,12 @@ msgstr "Versturen naar" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,subtype:0 msgid "Message type" -msgstr "" +msgstr "Bericht type" #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,auto_delete:0 msgid "Permanently delete emails after sending" -msgstr "" +msgstr "Verwijder e-mails definitief na verzending" #. module: crm_partner_assign #: field:crm.lead.report.assign,delay_close:0 @@ -40,7 +40,7 @@ msgstr "Vertraging tot sluiten" #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,email_to:0 msgid "Message recipients" -msgstr "" +msgstr "Ontvangers van het bericht" #. module: crm_partner_assign #: field:crm.lead.report.assign,planned_revenue:0 @@ -61,7 +61,7 @@ msgstr "Groepeer op..." #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,template_id:0 msgid "Template" -msgstr "" +msgstr "Sjabloon" #. module: crm_partner_assign #: view:crm.lead:0 @@ -76,12 +76,12 @@ msgstr "Geo lokaliseren" #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,body_text:0 msgid "Plain-text version of the message" -msgstr "" +msgstr "Platte tekst verzie van het bericht" #. module: crm_partner_assign #: view:crm.lead.forward.to.partner:0 msgid "Body" -msgstr "" +msgstr "Inhoud" #. module: crm_partner_assign #: selection:crm.lead.report.assign,month:0 @@ -101,7 +101,7 @@ msgstr "Vertraging tot sluiting" #. module: crm_partner_assign #: view:crm.partner.report.assign:0 msgid "#Partner" -msgstr "" +msgstr "#Partner" #. module: crm_partner_assign #: selection:crm.lead.forward.to.partner,history:0 @@ -137,7 +137,7 @@ msgstr "Hoogste" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,body_text:0 msgid "Text contents" -msgstr "" +msgstr "Tekst inhoud" #. module: crm_partner_assign #: view:crm.lead.report.assign:0 @@ -148,7 +148,7 @@ msgstr "Dag" #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,message_id:0 msgid "Message unique identifier" -msgstr "" +msgstr "Bericht unieke identifier" #. module: crm_partner_assign #: selection:crm.lead.forward.to.partner,history:0 @@ -167,6 +167,8 @@ msgid "" "Add here all attachments of the current document you want to include in the " "Email." msgstr "" +"Voeg hier alle bijlagen aan het huidige document toe die u bij de email wilt " +"bijvoegen." #. module: crm_partner_assign #: selection:crm.lead.report.assign,state:0 @@ -195,17 +197,17 @@ msgstr "" #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,body_html:0 msgid "Rich-text/HTML version of the message" -msgstr "" +msgstr "Rich-tekst/HTML versie van het bericht" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,auto_delete:0 msgid "Auto Delete" -msgstr "" +msgstr "Auto-verwijder" #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,email_bcc:0 msgid "Blind carbon copy message recipients" -msgstr "" +msgstr "Blind carbon copy ontvangers van het bericht" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,partner_id:0 @@ -254,7 +256,7 @@ msgstr "Afdeling" #. module: crm_partner_assign #: view:crm.lead.forward.to.partner:0 msgid "Send" -msgstr "" +msgstr "Verzend" #. module: crm_partner_assign #: view:res.partner:0 @@ -286,7 +288,7 @@ msgstr "Soort" #. module: crm_partner_assign #: view:crm.partner.report.assign:0 msgid "Name" -msgstr "" +msgstr "Naam" #. module: crm_partner_assign #: selection:crm.lead.report.assign,priority:0 @@ -299,11 +301,13 @@ msgid "" "Type of message, usually 'html' or 'plain', used to select plaintext or rich " "text contents accordingly" msgstr "" +"Soort bericht, normaliter 'html' of 'tekst', wordt gebruikt om te kiezen " +"voor platte tekst of tekst met opmaak." #. module: crm_partner_assign #: view:crm.lead.report.assign:0 msgid "Assign Date" -msgstr "" +msgstr "Wijs datum toe" #. module: crm_partner_assign #: view:crm.lead.report.assign:0 @@ -318,7 +322,7 @@ msgstr "Datum gemaakt" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,res_id:0 msgid "Related Document ID" -msgstr "" +msgstr "Gerelateerde document ID" #. module: crm_partner_assign #: view:crm.lead.report.assign:0 @@ -349,7 +353,7 @@ msgstr "Stadium" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,model:0 msgid "Related Document model" -msgstr "" +msgstr "Gerelateerde Document model" #. module: crm_partner_assign #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:192 @@ -392,7 +396,7 @@ msgstr "Sluiten" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,use_template:0 msgid "Use Template" -msgstr "" +msgstr "Gebruik sjabloon" #. module: crm_partner_assign #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign @@ -464,12 +468,12 @@ msgstr "#Verkoopkansen" #. module: crm_partner_assign #: view:crm.lead:0 msgid "Team" -msgstr "" +msgstr "Team" #. module: crm_partner_assign #: view:crm.lead:0 msgid "Referred Partner" -msgstr "" +msgstr "Voorkeur partner" #. module: crm_partner_assign #: selection:crm.lead.report.assign,state:0 @@ -490,7 +494,7 @@ msgstr "Gesloten" #. module: crm_partner_assign #: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward msgid "Mass forward to partner" -msgstr "" +msgstr "Als bulk doorsturen naar relatie" #. module: crm_partner_assign #: view:res.partner:0 @@ -570,7 +574,7 @@ msgstr "Geo lengtegraad" #. module: crm_partner_assign #: field:crm.partner.report.assign,opp:0 msgid "# of Opportunity" -msgstr "" +msgstr "# of prospect" #. module: crm_partner_assign #: view:crm.lead.report.assign:0 @@ -600,12 +604,12 @@ msgstr "Relatie waaraan dit dossier is toegewezen." #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,date:0 msgid "Date" -msgstr "" +msgstr "Datum" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,body_html:0 msgid "Rich-text contents" -msgstr "" +msgstr "Rich-tekst inhoud" #. module: crm_partner_assign #: view:crm.lead.report.assign:0 @@ -620,18 +624,18 @@ msgstr "res.partner.grade" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,message_id:0 msgid "Message-Id" -msgstr "" +msgstr "Bericht-Id" #. module: crm_partner_assign #: view:crm.lead.forward.to.partner:0 #: field:crm.lead.forward.to.partner,attachment_ids:0 msgid "Attachments" -msgstr "" +msgstr "Bijlagen" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,email_cc:0 msgid "Cc" -msgstr "" +msgstr "Cc" #. module: crm_partner_assign #: selection:crm.lead.report.assign,month:0 @@ -641,7 +645,7 @@ msgstr "September" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,references:0 msgid "References" -msgstr "" +msgstr "Referenties" #. module: crm_partner_assign #: view:crm.lead.report.assign:0 @@ -668,7 +672,7 @@ msgstr "Openen" #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,email_cc:0 msgid "Carbon copy message recipients" -msgstr "" +msgstr "Carbon copy ontvangers van het bericht" #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,headers:0 @@ -676,6 +680,8 @@ msgid "" "Full message headers, e.g. SMTP session headers (usually available on " "inbound messages only)" msgstr "" +"Volledige bericht koppen, bijvoorbeeld SMTP sessie koppen (normaliter alleen " +"beschikbaar bij inkomende berichten)" #. module: crm_partner_assign #: field:res.partner,date_localization:0 @@ -702,7 +708,7 @@ msgstr "" #. module: crm_partner_assign #: field:crm.partner.report.assign,nbr:0 msgid "# of Partner" -msgstr "" +msgstr "# Partners" #. module: crm_partner_assign #: view:crm.lead.forward.to.partner:0 @@ -713,7 +719,7 @@ msgstr "Doorsturen aan relatie" #. module: crm_partner_assign #: field:crm.partner.report.assign,name:0 msgid "Partner name" -msgstr "" +msgstr "Relatienaam" #. module: crm_partner_assign #: selection:crm.lead.report.assign,month:0 @@ -728,7 +734,7 @@ msgstr "Verwachte omzet" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,reply_to:0 msgid "Reply-To" -msgstr "" +msgstr "Antwoord-aan" #. module: crm_partner_assign #: field:crm.lead,partner_assigned_id:0 @@ -748,7 +754,7 @@ msgstr "Verkoopkans" #. module: crm_partner_assign #: view:crm.lead.forward.to.partner:0 msgid "Send Mail" -msgstr "" +msgstr "Verstuur bericht" #. module: crm_partner_assign #: field:crm.lead.report.assign,partner_id:0 @@ -776,7 +782,7 @@ msgstr "Land" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,headers:0 msgid "Message headers" -msgstr "" +msgstr "Bericht kop" #. module: crm_partner_assign #: view:res.partner:0 @@ -786,7 +792,7 @@ msgstr "Omzetten naar verkoopkans" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,email_bcc:0 msgid "Bcc" -msgstr "" +msgstr "Bcc" #. module: crm_partner_assign #: view:crm.lead:0 @@ -827,12 +833,13 @@ msgstr "CRM Lead overzicht" #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,references:0 msgid "Message references, such as identifiers of previous messages" -msgstr "" +msgstr "Bericht referenties, zoals identifiers van vorige berichten" #. module: crm_partner_assign #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." msgstr "" +"Fout! Het is niet mogelijk om recursieve geassocieerde leden te maken" #. module: crm_partner_assign #: selection:crm.lead.forward.to.partner,history:0 @@ -847,12 +854,12 @@ msgstr "Volgnummer" #. module: crm_partner_assign #: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign msgid "CRM Partner Report" -msgstr "" +msgstr "CRM relatierapport" #. module: crm_partner_assign #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner msgid "E-mail composition wizard" -msgstr "" +msgstr "E-mail opmaak wizard" #. module: crm_partner_assign #: selection:crm.lead.report.assign,priority:0 @@ -873,7 +880,7 @@ msgstr "Datum gemaakt" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,filter_id:0 msgid "Filters" -msgstr "" +msgstr "Filters" #. module: crm_partner_assign #: view:crm.lead.report.assign:0 @@ -884,7 +891,7 @@ msgstr "Jaar" #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,reply_to:0 msgid "Preferred response address for the message" -msgstr "" +msgstr "Voorkeur antwoordadres voor het bericht" #~ msgid "Reply-to of the Sales team defined on this case" #~ msgstr "Beantwoordt-aan van het voor dit dosseir gedefinieerde verkoopteam" diff --git a/addons/crm_profiling/i18n/nl.po b/addons/crm_profiling/i18n/nl.po index 6ca25d5ca37..2506327a38d 100644 --- a/addons/crm_profiling/i18n/nl.po +++ b/addons/crm_profiling/i18n/nl.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-14 04:22+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) \n" +"PO-Revision-Date: 2012-01-21 19:04+0000\n" +"Last-Translator: Erwin \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-12-23 07:04+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-22 05:30+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: crm_profiling #: view:crm_profiling.questionnaire:0 @@ -69,7 +69,7 @@ msgstr "Antwoord" #. module: crm_profiling #: model:ir.model,name:crm_profiling.model_open_questionnaire_line msgid "open.questionnaire.line" -msgstr "" +msgstr "open.questionnaire.line" #. module: crm_profiling #: model:ir.model,name:crm_profiling.model_crm_segmentation @@ -102,7 +102,7 @@ msgstr "Antwoorden" #. module: crm_profiling #: model:ir.model,name:crm_profiling.model_open_questionnaire msgid "open.questionnaire" -msgstr "" +msgstr "open.questionnaire" #. module: crm_profiling #: field:open.questionnaire,questionnaire_id:0 @@ -117,12 +117,12 @@ msgstr "Gebruik een vragenlijst" #. module: crm_profiling #: view:open.questionnaire:0 msgid "_Cancel" -msgstr "" +msgstr "_Annuleren" #. module: crm_profiling #: field:open.questionnaire,question_ans_ids:0 msgid "Question / Answers" -msgstr "" +msgstr "Vragen / Antwoorden" #. module: crm_profiling #: view:crm_profiling.questionnaire:0 @@ -156,6 +156,7 @@ msgstr "Gebruik de profileringsregels" #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." msgstr "" +"Fout! Het is niet mogelijk om recursieve geassocieerde leden te maken" #. module: crm_profiling #: view:crm_profiling.question:0 diff --git a/addons/delivery/i18n/nl.po b/addons/delivery/i18n/nl.po index 6fd70c9eece..dc2f97cb613 100644 --- a/addons/delivery/i18n/nl.po +++ b/addons/delivery/i18n/nl.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-13 18:38+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) \n" +"PO-Revision-Date: 2012-01-21 19:15+0000\n" +"Last-Translator: Erwin \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-12-23 05:52+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-22 05:30+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: delivery #: report:sale.shipping:0 @@ -69,7 +69,7 @@ msgstr "Planningsregel" #. module: delivery #: help:delivery.carrier,partner_id:0 msgid "The partner that is doing the delivery service." -msgstr "" +msgstr "De relatie die de afleveringsservice doet" #. module: delivery #: model:ir.actions.report.xml,name:delivery.report_shipping @@ -89,7 +89,7 @@ msgstr "Verzameld om te factureren" #. module: delivery #: field:delivery.carrier,pricelist_ids:0 msgid "Advanced Pricing" -msgstr "" +msgstr "Geavanceerd prijsbeheer" #. module: delivery #: help:delivery.grid,sequence:0 @@ -130,7 +130,7 @@ msgstr "" #. module: delivery #: field:delivery.carrier,amount:0 msgid "Amount" -msgstr "" +msgstr "Bedrag" #. module: delivery #: selection:delivery.grid.line,price_type:0 @@ -208,6 +208,9 @@ msgid "" "Define your delivery methods and their pricing. The delivery costs can be " "added on the sale order form or in the invoice, based on the delivery orders." msgstr "" +"Definieer uw levering methodes en hun prijzen. De leveringkosten kunnen " +"worden toegevoegd op de verkooporder of in de factuur, op basis van de " +"leveringsorders." #. module: delivery #: report:sale.shipping:0 @@ -217,7 +220,7 @@ msgstr "Partij" #. module: delivery #: field:delivery.carrier,partner_id:0 msgid "Transport Company" -msgstr "" +msgstr "Transport bedrijf" #. module: delivery #: model:ir.model,name:delivery.model_delivery_grid @@ -260,6 +263,8 @@ msgid "" "Amount of the order to benefit from a free shipping, expressed in the " "company currency" msgstr "" +"Bedrag van de bestelling wat kan profiteren van een gratis verzending, " +"uitgedrukt in het bedrijf valuta" #. module: delivery #: code:addons/delivery/stock.py:89 @@ -290,17 +295,17 @@ msgstr "Poscode Afleverradres" #: code:addons/delivery/delivery.py:143 #, python-format msgid "Default price" -msgstr "" +msgstr "Standaard prijs" #. module: delivery #: model:ir.model,name:delivery.model_delivery_define_delivery_steps_wizard msgid "delivery.define.delivery.steps.wizard" -msgstr "" +msgstr "delivery.define.delivery.steps.wizard" #. module: delivery #: field:delivery.carrier,normal_price:0 msgid "Normal Price" -msgstr "" +msgstr "Standaard prijs" #. module: delivery #: report:sale.shipping:0 @@ -337,17 +342,23 @@ msgid "" "Check this box if you want to manage delivery prices that depends on the " "destination, the weight, the total of the order, etc." msgstr "" +"Schakel dit selectievakje in als u wilt dat de levering prijzen afhankelijk " +"zijn van de bestemming, het gewicht, het totaal van de bestelling, enz." #. module: delivery #: help:delivery.carrier,normal_price:0 msgid "" "Keep empty if the pricing depends on the advanced pricing per destination" msgstr "" +"Laat leeg indien de prijs is gebaseerd op de geavanceerde prijs per " +"bestemming" #. module: delivery #: constraint:stock.move:0 msgid "You can not move products from or to a location of the type view." msgstr "" +"Het is niet mogelijk om producten te verplaatsen naar een locatie van het " +"type 'view'." #. module: delivery #: code:addons/delivery/wizard/delivery_sale_order.py:94 @@ -370,7 +381,7 @@ msgstr "Order niet in status \"Concept\"!" #. module: delivery #: view:delivery.define.delivery.steps.wizard:0 msgid "Choose Your Default Picking Policy" -msgstr "" +msgstr "Kies u standaard verzamelbeleid" #. module: delivery #: constraint:stock.move:0 @@ -407,7 +418,7 @@ msgstr "Kostprijs" #. module: delivery #: field:delivery.define.delivery.steps.wizard,picking_policy:0 msgid "Picking Policy" -msgstr "" +msgstr "Verzamelbeleid" #. module: delivery #: selection:delivery.grid.line,price_type:0 @@ -424,7 +435,7 @@ msgstr "" #. module: delivery #: sql_constraint:stock.picking:0 msgid "Reference must be unique per Company!" -msgstr "" +msgstr "Referentie moet uniek zijn per bedrijf!" #. module: delivery #: field:delivery.grid.line,max_value:0 @@ -440,12 +451,12 @@ msgstr "Aantal" #: view:delivery.define.delivery.steps.wizard:0 #: model:ir.actions.act_window,name:delivery.action_define_delivery_steps msgid "Setup Your Picking Policy" -msgstr "" +msgstr "Stel uw verzamelbeleid in" #. module: delivery #: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form1 msgid "Define Delivery Methods" -msgstr "" +msgstr "Definieer aflever methodes" #. module: delivery #: help:delivery.carrier,free_if_more_than:0 @@ -453,6 +464,8 @@ msgid "" "If the order is more expensive than a certain amount, the customer can " "benefit from a free shipping" msgstr "" +"Als de bestelling duurder is dan een bepaald bedrag kan de klant profiteren " +"van een gratis verzending" #. module: delivery #: help:sale.order,carrier_id:0 @@ -471,12 +484,12 @@ msgstr "Annuleren" #: code:addons/delivery/delivery.py:131 #, python-format msgid "Free if more than %.2f" -msgstr "" +msgstr "Gratis indien meer dan %.2f" #. module: delivery #: sql_constraint:sale.order:0 msgid "Order Reference must be unique per Company!" -msgstr "" +msgstr "Orderreferentie moet uniek zijn per bedrijf!" #. module: delivery #: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form @@ -485,6 +498,9 @@ msgid "" "reinvoice the delivery costs when you are doing invoicing based on delivery " "orders" msgstr "" +"Definieer de levering methodes die u gebruikt en hun prijzen, om de " +"verzendkosten te her-factureren wanneer facturatie baseert op leverings " +"orders" #. module: delivery #: view:res.partner:0 @@ -504,7 +520,7 @@ msgstr "U moet een productie partij toewijzen voor dit product" #. module: delivery #: field:delivery.carrier,free_if_more_than:0 msgid "Free If More Than" -msgstr "" +msgstr "Gratis indien meer dan" #. module: delivery #: view:delivery.sale.order:0 @@ -576,17 +592,17 @@ msgstr "De vervoerder %s (id: %d) heeft geen leveringsmatrix!" #. module: delivery #: view:delivery.carrier:0 msgid "Pricing Information" -msgstr "" +msgstr "Prijsbeleid informatie" #. module: delivery #: selection:delivery.define.delivery.steps.wizard,picking_policy:0 msgid "Deliver all products at once" -msgstr "" +msgstr "Lever alle producten in 1 keer" #. module: delivery #: field:delivery.carrier,use_detailed_pricelist:0 msgid "Advanced Pricing per Destination" -msgstr "" +msgstr "Geavanceerd prijsbeleid per bestemming" #. module: delivery #: view:delivery.carrier:0 @@ -619,6 +635,7 @@ msgstr "" #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." msgstr "" +"Fout! Het is niet mogelijk om recursieve geassocieerde leden te maken" #. module: delivery #: field:delivery.grid,sequence:0 @@ -639,12 +656,12 @@ msgstr "Afleveringskosten" #. module: delivery #: selection:delivery.define.delivery.steps.wizard,picking_policy:0 msgid "Deliver each product when available" -msgstr "" +msgstr "Lever ieder product wanneer beschikbaar" #. module: delivery #: view:delivery.define.delivery.steps.wizard:0 msgid "Apply" -msgstr "" +msgstr "Toepassen" #. module: delivery #: field:delivery.grid.line,price_type:0 diff --git a/addons/document/i18n/nl.po b/addons/document/i18n/nl.po index 7e8f819b636..30278689f45 100644 --- a/addons/document/i18n/nl.po +++ b/addons/document/i18n/nl.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-12 15:28+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2012-01-22 19:04+0000\n" +"Last-Translator: Erwin \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-12-23 07:11+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-23 05:20+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: document #: field:document.directory,parent_id:0 @@ -151,7 +151,7 @@ msgstr "Mapnaam moet uniek zijn" #. module: document #: view:ir.attachment:0 msgid "Filter on my documents" -msgstr "" +msgstr "Filter op mijn documenten" #. module: document #: field:ir.attachment,index_content:0 @@ -170,7 +170,7 @@ msgstr "" #. module: document #: model:ir.actions.todo.category,name:document.category_knowledge_mgmt_config msgid "Knowledge Management" -msgstr "" +msgstr "Kennisbeheer" #. module: document #: view:document.directory:0 @@ -204,7 +204,7 @@ msgstr "Mappen per resource" #. module: document #: view:ir.attachment:0 msgid "Indexed Content - experimental" -msgstr "" +msgstr "Geïndexeerde inhoud - Experimenteel" #. module: document #: field:document.directory.content,suffix:0 @@ -390,6 +390,8 @@ msgid "" "When executing this wizard, it will configure your directories automatically " "according to modules installed." msgstr "" +"Bij het uitvoeren van deze wizard, zal het automatisch de mappen " +"configureren op basis van de geïnstalleerde modules." #. module: document #: field:document.directory.content,directory_id:0 @@ -525,7 +527,7 @@ msgstr "" #. module: document #: model:ir.actions.act_window,name:document.action_config_auto_directory msgid "Configure Directories" -msgstr "" +msgstr "Geconfigureerde mappen" #. module: document #: field:document.directory.content,include_name:0 @@ -679,7 +681,7 @@ msgstr "Alleen lezen" #. module: document #: model:ir.actions.act_window,name:document.action_document_directory_form msgid "Document Directory" -msgstr "" +msgstr "Document mappen" #. module: document #: sql_constraint:document.directory:0 @@ -705,6 +707,11 @@ msgid "" "attached to the document, or to print and download any report. This tool " "will create directories automatically according to modules installed." msgstr "" +"OpenERP's Document Management System ondersteunt het mappen van virtuele " +"mappen met documenten. De virtuele map van een document kan worden gebruikt " +"om de bestanden die bij het document behoren te beheren, of om af te drukken " +"en te downloaden. Deze tool maakt automatisch mappen op basis van " +"geïnstalleerde modules." #. module: document #: view:board.board:0 @@ -798,7 +805,7 @@ msgstr "Maand" #. module: document #: view:report.document.user:0 msgid "This Months Files" -msgstr "" +msgstr "Deze maand bestanden" #. module: document #: model:ir.ui.menu,name:document.menu_reporting @@ -864,7 +871,7 @@ msgstr "Bestanden per relatie" #. module: document #: view:document.configuration:0 msgid "Configure Direcories" -msgstr "" +msgstr "Geconfigureerde mappen" #. module: document #: view:report.document.user:0 @@ -879,7 +886,7 @@ msgstr "Notities" #. module: document #: model:ir.model,name:document.model_document_configuration msgid "Directory Configuration" -msgstr "" +msgstr "Mappen configuratie" #. module: document #: help:document.directory,type:0 @@ -982,7 +989,7 @@ msgstr "Mime Type" #. module: document #: view:report.document.user:0 msgid "All Months Files" -msgstr "" +msgstr "Alle maanden bestanden" #. module: document #: field:document.directory.content,name:0 diff --git a/addons/hr_payroll/i18n/nl.po b/addons/hr_payroll/i18n/nl.po index 13892fa769d..ae60e101f46 100644 --- a/addons/hr_payroll/i18n/nl.po +++ b/addons/hr_payroll/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:43+0000\n" -"PO-Revision-Date: 2011-01-10 16:37+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-01-22 19:09+0000\n" +"Last-Translator: Erwin \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:15+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-23 05:20+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: hr_payroll #: field:hr.payslip.line,condition_select:0 @@ -26,7 +26,7 @@ msgstr "" #. module: hr_payroll #: selection:hr.contract,schedule_pay:0 msgid "Monthly" -msgstr "" +msgstr "Maandelijks" #. module: hr_payroll #: view:hr.payslip:0 @@ -54,19 +54,19 @@ msgstr "" #: view:hr.payslip.line:0 #: view:hr.salary.rule:0 msgid "Group By..." -msgstr "" +msgstr "Groepeer op..." #. module: hr_payroll #: view:hr.payslip:0 msgid "States" -msgstr "" +msgstr "Statussen" #. module: hr_payroll #: field:hr.payslip.line,input_ids:0 #: view:hr.salary.rule:0 #: field:hr.salary.rule,input_ids:0 msgid "Inputs" -msgstr "" +msgstr "Invoer" #. module: hr_payroll #: field:hr.payslip.line,parent_rule_id:0 @@ -87,7 +87,7 @@ msgstr "Salarisstrook" #: field:hr.payroll.structure,parent_id:0 #: field:hr.salary.rule.category,parent_id:0 msgid "Parent" -msgstr "" +msgstr "Bovenliggend" #. module: hr_payroll #: report:paylip.details:0 @@ -125,13 +125,13 @@ msgstr "Zet op concept" #. module: hr_payroll #: model:ir.model,name:hr_payroll.model_hr_salary_rule msgid "hr.salary.rule" -msgstr "" +msgstr "hr.salary.rule" #. module: hr_payroll #: field:hr.payslip,payslip_run_id:0 #: model:ir.model,name:hr_payroll.model_hr_payslip_run msgid "Payslip Batches" -msgstr "" +msgstr "Loonafschrift batces" #. module: hr_payroll #: view:hr.payslip.employees:0 @@ -161,7 +161,7 @@ msgstr "Loonafschrift" #. module: hr_payroll #: view:hr.payslip.employees:0 msgid "Generate" -msgstr "" +msgstr "Genereren" #. module: hr_payroll #: help:hr.payslip.line,amount_percentage_base:0 @@ -172,7 +172,7 @@ msgstr "" #. module: hr_payroll #: report:contribution.register.lines:0 msgid "Total:" -msgstr "" +msgstr "Totaal:" #. module: hr_payroll #: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules @@ -183,18 +183,18 @@ msgstr "" #: view:hr.payslip:0 #: view:hr.salary.rule:0 msgid "Input Data" -msgstr "" +msgstr "Invoergegevens" #. module: hr_payroll #: constraint:hr.payslip:0 msgid "Payslip 'Date From' must be before 'Date To'." -msgstr "" +msgstr "Loonafschrift \"Datum van' moet voor 'Datum t/m' liggen" #. module: hr_payroll #: view:hr.payslip:0 #: view:hr.salary.rule.category:0 msgid "Notes" -msgstr "" +msgstr "Notities" #. module: hr_payroll #: view:hr.payslip:0 @@ -208,14 +208,14 @@ msgstr "" #: report:paylip.details:0 #: report:payslip:0 msgid "Amount" -msgstr "" +msgstr "Bedrag" #. module: hr_payroll #: view:hr.payslip:0 #: view:hr.payslip.line:0 #: model:ir.model,name:hr_payroll.model_hr_payslip_line msgid "Payslip Line" -msgstr "" +msgstr "Loonafschrift regel" #. module: hr_payroll #: view:hr.payslip:0 @@ -237,7 +237,7 @@ msgstr "" #: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52 #, python-format msgid "Warning !" -msgstr "" +msgstr "Waarschuwing !" #. module: hr_payroll #: report:paylip.details:0 @@ -248,7 +248,7 @@ msgstr "" #: report:paylip.details:0 #: report:payslip:0 msgid "Note" -msgstr "" +msgstr "Opmerking" #. module: hr_payroll #: field:hr.payroll.structure,code:0 @@ -256,7 +256,7 @@ msgstr "" #: report:paylip.details:0 #: report:payslip:0 msgid "Reference" -msgstr "" +msgstr "Referentie" #. module: hr_payroll #: view:hr.payslip:0 @@ -279,12 +279,12 @@ msgstr "" #: report:paylip.details:0 #: report:payslip:0 msgid "Identification No" -msgstr "" +msgstr "Identificatienr." #. module: hr_payroll #: field:hr.payslip,struct_id:0 msgid "Structure" -msgstr "" +msgstr "Structuur" #. module: hr_payroll #: help:hr.employee,total_wage:0 @@ -294,7 +294,7 @@ msgstr "" #. module: hr_payroll #: view:hr.payslip:0 msgid "Total Working Days" -msgstr "" +msgstr "Totaal aantal werkdagen" #. module: hr_payroll #: help:hr.payslip.line,code:0 @@ -307,12 +307,12 @@ msgstr "" #. module: hr_payroll #: selection:hr.contract,schedule_pay:0 msgid "Weekly" -msgstr "" +msgstr "Wekelijks" #. module: hr_payroll #: view:hr.payslip:0 msgid "Confirm" -msgstr "" +msgstr "Bevestigen" #. module: hr_payroll #: model:ir.actions.report.xml,name:hr_payroll.payslip_report @@ -350,7 +350,7 @@ msgstr "" #. module: hr_payroll #: selection:hr.contract,schedule_pay:0 msgid "Quarterly" -msgstr "" +msgstr "Driemaandelijks" #. module: hr_payroll #: field:hr.payslip,state:0 @@ -376,7 +376,7 @@ msgstr "" #: field:hr.payslip.line,employee_id:0 #: model:ir.model,name:hr_payroll.model_hr_employee msgid "Employee" -msgstr "" +msgstr "Werknemer" #. module: hr_payroll #: selection:hr.contract,schedule_pay:0 @@ -392,7 +392,7 @@ msgstr "" #: report:paylip.details:0 #: report:payslip:0 msgid "Email" -msgstr "" +msgstr "E-mail" #. module: hr_payroll #: view:hr.payslip.run:0 @@ -434,12 +434,12 @@ msgstr "" #. module: hr_payroll #: field:hr.payslip.worked_days,number_of_days:0 msgid "Number of Days" -msgstr "" +msgstr "Aantal dagen" #. module: hr_payroll #: selection:hr.payslip,state:0 msgid "Rejected" -msgstr "" +msgstr "Afgewezen" #. module: hr_payroll #: view:hr.payroll.structure:0 @@ -466,7 +466,7 @@ msgstr "" #: selection:hr.payslip,state:0 #: view:hr.payslip.run:0 msgid "Done" -msgstr "" +msgstr "Gereed" #. module: hr_payroll #: field:hr.payslip.line,appears_on_payslip:0 @@ -480,7 +480,7 @@ msgstr "" #: field:hr.salary.rule,amount_fix:0 #: selection:hr.salary.rule,amount_select:0 msgid "Fixed Amount" -msgstr "" +msgstr "Vast Bedrag" #. module: hr_payroll #: help:hr.payslip.line,active:0 @@ -514,7 +514,7 @@ msgstr "" #. module: hr_payroll #: field:hr.payslip.worked_days,number_of_hours:0 msgid "Number of Hours" -msgstr "" +msgstr "Aantal uren" #. module: hr_payroll #: view:hr.payslip:0 @@ -547,7 +547,7 @@ msgstr "" #: selection:hr.payslip.line,condition_select:0 #: selection:hr.salary.rule,condition_select:0 msgid "Range" -msgstr "" +msgstr "Bereik" #. module: hr_payroll #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree @@ -558,12 +558,12 @@ msgstr "" #. module: hr_payroll #: view:hr.payslip:0 msgid "Payslip" -msgstr "" +msgstr "Loonafschrift" #. module: hr_payroll #: constraint:hr.contract:0 msgid "Error! contract start-date must be lower then contract end-date." -msgstr "" +msgstr "Fout! startdatum contract moet vóór einddatum contract liggen." #. module: hr_payroll #: view:hr.contract:0 @@ -602,7 +602,7 @@ msgstr "" #. module: hr_payroll #: view:hr.salary.rule:0 msgid "Computation" -msgstr "" +msgstr "Berekening" #. module: hr_payroll #: help:hr.payslip.input,amount:0 @@ -624,7 +624,7 @@ msgstr "" #: view:hr.salary.rule:0 #: field:hr.salary.rule,category_id:0 msgid "Category" -msgstr "" +msgstr "Categorie" #. module: hr_payroll #: help:hr.payslip.run,credit_note:0 @@ -650,7 +650,7 @@ msgstr "" #: view:hr.payslip.run:0 #: selection:hr.payslip.run,state:0 msgid "Draft" -msgstr "" +msgstr "Concept" #. module: hr_payroll #: report:contribution.register.lines:0 @@ -660,7 +660,7 @@ msgstr "" #: report:payslip:0 #: field:payslip.lines.contribution.register,date_from:0 msgid "Date From" -msgstr "" +msgstr "Vanaf datum" #. module: hr_payroll #: view:hr.payslip.run:0 @@ -675,7 +675,7 @@ msgstr "" #. module: hr_payroll #: view:hr.salary.rule:0 msgid "Conditions" -msgstr "" +msgstr "Voorwaarden" #. module: hr_payroll #: field:hr.payslip.line,amount_percentage:0 @@ -1322,3 +1322,6 @@ msgstr "" #~ msgid "Expire" #~ msgstr "Verlooptijd" + +#~ msgid "Human Resource Payroll" +#~ msgstr "HR loonlijst" diff --git a/addons/point_of_sale/i18n/de.po b/addons/point_of_sale/i18n/de.po index c04ad96a436..8c20b9e3200 100644 --- a/addons/point_of_sale/i18n/de.po +++ b/addons/point_of_sale/i18n/de.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:43+0000\n" -"PO-Revision-Date: 2011-07-23 02:59+0000\n" -"Last-Translator: Raphael Collet (OpenERP) \n" +"PO-Revision-Date: 2012-01-22 21:13+0000\n" +"Last-Translator: Ferdinand @ Camptocamp \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-12-23 05:57+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-23 05:20+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: point_of_sale #: field:report.transaction.pos,product_nb:0 @@ -35,7 +35,7 @@ msgstr "Heute" #. module: point_of_sale #: view:pos.confirm:0 msgid "Post All Orders" -msgstr "" +msgstr "Verbuche alle Aufträge" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_box_out @@ -71,7 +71,7 @@ msgstr "Erfasse Zahlung:" #. module: point_of_sale #: field:pos.box.out,name:0 msgid "Description / Reason" -msgstr "" +msgstr "Beschreibung / Grund" #. module: point_of_sale #: view:report.cash.register:0 @@ -82,7 +82,7 @@ msgstr "Meine Verkäufe" #. module: point_of_sale #: view:report.cash.register:0 msgid "Month from Creation date of cash register" -msgstr "" +msgstr "Monat der Erstellung der Kassa" #. module: point_of_sale #: report:account.statement:0 @@ -101,13 +101,15 @@ msgid "" "Configuration error! The currency chosen should be shared by the default " "accounts too." msgstr "" +"Konfigurationsfehler! Die gewählte Währung muss auch bei den Standardkonten " +"verwendet werden" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.pos_category_action #: model:ir.ui.menu,name:point_of_sale.menu_pos_category #: view:pos.category:0 msgid "PoS Categories" -msgstr "" +msgstr "POS Kategorien" #. module: point_of_sale #: report:pos.lines:0 @@ -136,6 +138,8 @@ msgid "" "You do not have any open cash register. You must create a payment method or " "open a cash register." msgstr "" +"Sie haben keine offenen Registierkassen. Sie müssen einen Zahlungsweg " +"festelgen oder ein Registerkasse öffnen." #. module: point_of_sale #: report:account.statement:0 @@ -179,7 +183,7 @@ msgstr "Status" #. module: point_of_sale #: view:pos.order:0 msgid "Accounting Information" -msgstr "" +msgstr "Finanzbuchhaltung Info" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month @@ -226,11 +230,13 @@ msgid "" "This is a product you can use to put cash into a statement for the point of " "sale backend." msgstr "" +"Dies ist ein Produkt mit dem Sie Geld in einen Buchungsbeleg der " +"Kassenverwaltung geben können." #. module: point_of_sale #: field:pos.category,parent_id:0 msgid "Parent Category" -msgstr "" +msgstr "Übergeordnete Kategorie" #. module: point_of_sale #: report:pos.details:0 @@ -265,12 +271,12 @@ msgstr "Verkäufe des Monats nach Benutzer" #. module: point_of_sale #: view:report.cash.register:0 msgid "Cash Analysis created during this year" -msgstr "" +msgstr "Kassa Analyse des laufenden Jahres" #. module: point_of_sale #: view:report.cash.register:0 msgid "Day from Creation date of cash register" -msgstr "" +msgstr "Tag der Erzeugung einer Registrierkasse" #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale @@ -281,12 +287,13 @@ msgstr "Tagesvorfälle" #: code:addons/point_of_sale/point_of_sale.py:273 #, python-format msgid "Configuration Error !" -msgstr "" +msgstr "Fehler Konfiguration !" #. module: point_of_sale #: view:pos.box.entries:0 msgid "Fill in this form if you put money in the cash register:" msgstr "" +"Füllen Sie dieses Formular aus, wenn Sie Geld in die Regstrierkasse geben" #. module: point_of_sale #: view:account.bank.statement:0 @@ -313,7 +320,7 @@ msgstr "Verkäufe nach Benutzer je Monat" #. module: point_of_sale #: field:pos.category,child_id:0 msgid "Children Categories" -msgstr "" +msgstr "Unterkategorien" #. module: point_of_sale #: field:pos.make.payment,payment_date:0 @@ -326,6 +333,8 @@ msgid "" "If you want to sell this product through the point of sale, select the " "category it belongs to." msgstr "" +"Wenn Sie diese Produkt in der Kasse verkaufen wollen, dann wählen Sie eine " +"Kategorie dafür aus." #. module: point_of_sale #: report:account.statement:0 @@ -357,7 +366,7 @@ msgstr "Menge" #. module: point_of_sale #: field:pos.order.line,name:0 msgid "Line No" -msgstr "" +msgstr "Zeile Nr." #. module: point_of_sale #: view:account.bank.statement:0 @@ -372,7 +381,7 @@ msgstr "Summe Netto:" #. module: point_of_sale #: field:pos.make.payment,payment_name:0 msgid "Payment Reference" -msgstr "" +msgstr "Zahlung Refrenz" #. module: point_of_sale #: report:pos.details_summary:0 @@ -382,13 +391,13 @@ msgstr "Zahlungsmodus" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_confirm msgid "Post POS Journal Entries" -msgstr "" +msgstr "Verbuche POS Buchungen" #. module: point_of_sale #: code:addons/point_of_sale/point_of_sale.py:396 #, python-format msgid "Customer Invoice" -msgstr "" +msgstr "Ausgangsrechnung" #. module: point_of_sale #: view:pos.box.out:0 @@ -450,7 +459,7 @@ msgstr "Tel.:" #: model:ir.actions.act_window,name:point_of_sale.action_pos_confirm #: model:ir.ui.menu,name:point_of_sale.menu_wizard_pos_confirm msgid "Create Sale Entries" -msgstr "" +msgstr "Erzeuge Verkauf Buchungen" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment @@ -462,7 +471,7 @@ msgstr "Zahlung" #. module: point_of_sale #: view:report.cash.register:0 msgid "Cash Analysis created in current month" -msgstr "" +msgstr "Geld Analyse des laufenden Monats" #. module: point_of_sale #: report:account.statement:0 @@ -473,7 +482,7 @@ msgstr "Endsaldo" #. module: point_of_sale #: view:pos.order:0 msgid "Post Entries" -msgstr "" +msgstr "Verbuche Buchungen" #. module: point_of_sale #: report:pos.details_summary:0 @@ -500,14 +509,14 @@ msgstr "Offene Kassenbücher" #. module: point_of_sale #: view:report.pos.order:0 msgid "POS ordered created during current year" -msgstr "" +msgstr "Kassa Aufträge des aktuellen Jahres" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form #: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale #: view:pos.order:0 msgid "PoS Orders" -msgstr "" +msgstr "POS Aufträge" #. module: point_of_sale #: report:pos.details:0 @@ -523,7 +532,7 @@ msgstr "Summe bezahlt" #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_all_menu_all_register msgid "List of Cash Registers" -msgstr "" +msgstr "Liste der Kassabücher" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_report_transaction_pos @@ -533,7 +542,7 @@ msgstr "Transaktion" #. module: point_of_sale #: view:report.pos.order:0 msgid "Not Invoiced" -msgstr "" +msgstr "Nicht in Rechnung gestellt" #. module: point_of_sale #: selection:report.cash.register,month:0 @@ -558,7 +567,7 @@ msgstr "Sie müssen noch eine Preisliste beim Verkaufsauftrag wählen !" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_discount msgid "Add a Global Discount" -msgstr "" +msgstr "Füge allg. Rabatt hinzu" #. module: point_of_sale #: field:pos.order.line,price_subtotal_incl:0 @@ -581,7 +590,7 @@ msgstr "Anfangssaldo" #: model:ir.model,name:point_of_sale.model_pos_category #: field:product.product,pos_categ_id:0 msgid "PoS Category" -msgstr "" +msgstr "POS Kategorie" #. module: point_of_sale #: report:pos.payment.report.user:0 @@ -598,7 +607,7 @@ msgstr "# Positionen" #: view:pos.order:0 #: selection:pos.order,state:0 msgid "Posted" -msgstr "" +msgstr "Gebucht" #. module: point_of_sale #: report:all.closed.cashbox.of.the.day:0 @@ -671,7 +680,7 @@ msgstr "# Menge" #: model:ir.actions.act_window,name:point_of_sale.action_box_out #: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl2 msgid "Take Money Out" -msgstr "" +msgstr "Geld entnehmen" #. module: point_of_sale #: view:pos.order:0 @@ -734,6 +743,8 @@ msgid "" "This field authorize Validation of Cashbox without controlling the closing " "balance." msgstr "" +"Dieses Feld ermöglicht die Validierung der Registrierkasse ohne den Saldo zu " +"überprüfen." #. module: point_of_sale #: report:pos.invoice:0 @@ -840,7 +851,7 @@ msgstr "Preis" #. module: point_of_sale #: field:account.journal,journal_user:0 msgid "PoS Payment Method" -msgstr "" +msgstr "POS Zahlungsmethode" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_sale_user @@ -852,7 +863,7 @@ msgstr "Verkäufe nach Benutzer" #. module: point_of_sale #: help:product.product,img:0 msgid "Use an image size of 50x50." -msgstr "" +msgstr "Verwende ein Bild 50x50" #. module: point_of_sale #: field:report.cash.register,date:0 @@ -863,7 +874,7 @@ msgstr "Erzeugt am" #: code:addons/point_of_sale/point_of_sale.py:53 #, python-format msgid "Unable to Delete !" -msgstr "" +msgstr "Nicht löschbar!" #. module: point_of_sale #: report:pos.details:0 @@ -887,6 +898,8 @@ msgid "" "There is no receivable account defined to make payment for the partner: " "\"%s\" (id:%d)" msgstr "" +"Um Zahlungen durchzuführen muss ein Forderungskonto für den Partner " +"definiert sein, : \"%s\" (id:%d)" #. module: point_of_sale #: code:addons/point_of_sale/point_of_sale.py:281 @@ -929,23 +942,23 @@ msgstr "Druckdatum" #: code:addons/point_of_sale/point_of_sale.py:270 #, python-format msgid "There is no receivable account defined to make payment" -msgstr "" +msgstr "Für Zahlungen muss ein Forderungskonto definiert sein." #. module: point_of_sale #: view:pos.open.statement:0 msgid "Do you want to open cash registers ?" -msgstr "" +msgstr "Wollen Sie eine Registrierkasse öffnen" #. module: point_of_sale #: help:pos.category,sequence:0 msgid "" "Gives the sequence order when displaying a list of product categories." -msgstr "" +msgstr "Reihenfolge bei Anzeige einer Liste für Produktkategorien" #. module: point_of_sale #: field:product.product,expense_pdt:0 msgid "PoS Cash Output" -msgstr "" +msgstr "Kassa Geld Ausgang" #. module: point_of_sale #: view:account.bank.statement:0 @@ -958,7 +971,7 @@ msgstr "Gruppierung..." #. module: point_of_sale #: field:product.product,img:0 msgid "Product Image, must be 50x50" -msgstr "" +msgstr "Produkt Bild, muss 50x50 sein" #. module: point_of_sale #: view:pos.order:0 @@ -979,7 +992,7 @@ msgstr "Keine Preisliste!" #. module: point_of_sale #: view:pos.order:0 msgid "Update" -msgstr "" +msgstr "Aktualisieren" #. module: point_of_sale #: report:pos.invoice:0 @@ -989,7 +1002,7 @@ msgstr "Basis" #. module: point_of_sale #: view:product.product:0 msgid "Point-of-Sale" -msgstr "" +msgstr "Kassa" #. module: point_of_sale #: report:pos.details:0 @@ -1036,7 +1049,7 @@ msgstr "Produkte" #: model:ir.actions.act_window,name:point_of_sale.action_product_output #: model:ir.ui.menu,name:point_of_sale.products_for_output_operations msgid "Products 'Put Money In'" -msgstr "" +msgstr "Produkt 'Geld Einzahlen'" #. module: point_of_sale #: view:pos.order:0 @@ -1061,7 +1074,7 @@ msgstr "Drucke Quittung für Barverkauf" #. module: point_of_sale #: field:pos.make.payment,journal:0 msgid "Payment Mode" -msgstr "" +msgstr "Zahlungsmethode" #. module: point_of_sale #: report:pos.details:0 @@ -1084,6 +1097,9 @@ msgid "" "This is a product you can use to take cash from a statement for the point of " "sale backend, exemple: money lost, transfer to bank, etc." msgstr "" +"Dies ist ein Produkt mit dem Sie Geld aus einen Buchungsbeleg der " +"Kassenverwaltung nehmen können. Beispiel: Verlust, Überweisung auf die Bank " +"etc" #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_open_statement @@ -1130,7 +1146,7 @@ msgstr "Automatische Eröffnung" #. module: point_of_sale #: selection:report.pos.order,state:0 msgid "Synchronized" -msgstr "" +msgstr "Synchronisiert" #. module: point_of_sale #: view:report.cash.register:0 @@ -1148,7 +1164,7 @@ msgstr "Kassenbuch" #. module: point_of_sale #: view:report.pos.order:0 msgid "Year of order date" -msgstr "" +msgstr "Jahr des Bestelldatums" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_tree @@ -1176,7 +1192,7 @@ msgstr "Tägl. Marge nach Benutzer" #: model:ir.actions.act_window,name:point_of_sale.action_box_entries #: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl msgid "Put Money In" -msgstr "" +msgstr "Zahle Geld ein" #. module: point_of_sale #: field:report.cash.register,balance_start:0 @@ -1187,12 +1203,12 @@ msgstr "Startsaldo" #: view:account.bank.statement:0 #: selection:report.pos.order,state:0 msgid "Closed" -msgstr "" +msgstr "Abgeschlossen" #. module: point_of_sale #: view:report.pos.order:0 msgid "POS ordered created by today" -msgstr "" +msgstr "Kassaaufträge bis heute" #. module: point_of_sale #: field:pos.order,amount_paid:0 @@ -1213,7 +1229,7 @@ msgstr "Rabatt (%)" #. module: point_of_sale #: view:report.cash.register:0 msgid "Cash Analysis created in last month" -msgstr "" +msgstr "Geldanlyse des letzten Monats" #. module: point_of_sale #: view:pos.close.statement:0 @@ -1222,11 +1238,14 @@ msgid "" "validation. He will also open all cash registers for which you have to " "control the ending belance before closing manually." msgstr "" +"OpenERP wird alle Registerkassen schließen, die ohne Validierung geschlossen " +"werden können und alle Registerkassen öffnen, die Sie vor manueller " +"Schließung validieren müssen." #. module: point_of_sale #: view:report.cash.register:0 msgid "Cash Analysis created by today" -msgstr "" +msgstr "Cash Analyse inkl. heute" #. module: point_of_sale #: selection:report.cash.register,state:0 @@ -1259,7 +1278,7 @@ msgstr "Kassenblatt" #. module: point_of_sale #: view:report.cash.register:0 msgid "Year from Creation date of cash register" -msgstr "" +msgstr "Jahr der Erstellung der Registrierkasse" #. module: point_of_sale #: view:pos.order:0 @@ -1292,11 +1311,14 @@ msgid "" "payments. We suggest you to control the opening balance of each register, " "using their CashBox tab." msgstr "" +"Das System wird alle Registrierkassen öffnen, damit Sie Zahlungen erfassen " +"können. Es ist empfehlenswert die Eröffnungsbilanzen aller Registerkassen " +"mit dem Reiter Kassenlade zu überprüfen." #. module: point_of_sale #: field:account.journal,check_dtls:0 msgid "Control Balance Before Closing" -msgstr "" +msgstr "Saldo vor Abschluß" #. module: point_of_sale #: view:pos.order:0 @@ -1339,7 +1361,7 @@ msgstr "Verkaufsmargen nach Benutzer" #: code:addons/point_of_sale/wizard/pos_payment.py:59 #, python-format msgid "Paiement" -msgstr "" +msgstr "Zahlung" #. module: point_of_sale #: report:pos.invoice:0 @@ -1376,12 +1398,12 @@ msgstr "Closing Balance" #: model:ir.actions.act_window,name:point_of_sale.action_pos_sale_all #: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale_all msgid "All Sales Orders" -msgstr "" +msgstr "Alle Verkaufs Aufträge" #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_point_root msgid "PoS Backend" -msgstr "" +msgstr "POS Verwaltung" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_details @@ -1403,7 +1425,7 @@ msgstr "Verkäufe nach Benutzer" #. module: point_of_sale #: report:pos.details:0 msgid "Order" -msgstr "" +msgstr "Auftrag" #. module: point_of_sale #: code:addons/point_of_sale/point_of_sale.py:460 @@ -1426,7 +1448,7 @@ msgstr "Nettobetrag:" #. module: point_of_sale #: model:res.groups,name:point_of_sale.group_pos_manager msgid "Manager" -msgstr "" +msgstr "Manager" #. module: point_of_sale #: field:pos.details,date_start:0 @@ -1477,7 +1499,7 @@ msgstr "Auswertungen Aus-/Einzahlungen" #. module: point_of_sale #: view:pos.confirm:0 msgid "Generate Journal Entries" -msgstr "" +msgstr "Erzeuge Buchungen" #. module: point_of_sale #: report:account.statement:0 @@ -1503,19 +1525,19 @@ msgstr "Rechnungsdatum" #. module: point_of_sale #: field:pos.box.entries,name:0 msgid "Reason" -msgstr "" +msgstr "Begründung" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_product_input #: model:ir.ui.menu,name:point_of_sale.products_for_input_operations msgid "Products 'Take Money Out'" -msgstr "" +msgstr "Produkte 'Nimm Geld heraus'" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_account_journal_form #: model:ir.ui.menu,name:point_of_sale.menu_action_account_journal_form_open msgid "Payment Methods" -msgstr "" +msgstr "Zahlungswege" #. module: point_of_sale #: code:addons/point_of_sale/point_of_sale.py:281 @@ -1533,7 +1555,7 @@ msgstr "Heutige Zahlungen nach Benutzer" #. module: point_of_sale #: view:pos.open.statement:0 msgid "Open Registers" -msgstr "" +msgstr "Öffne Registerkassen" #. module: point_of_sale #: code:addons/point_of_sale/point_of_sale.py:226 @@ -1551,7 +1573,7 @@ msgstr "Anz. der Artikel" #: selection:pos.order,state:0 #: selection:report.pos.order,state:0 msgid "Cancelled" -msgstr "" +msgstr "Storniert" #. module: point_of_sale #: field:pos.order,picking_id:0 @@ -1595,12 +1617,12 @@ msgstr "Beende Kasse" #: code:addons/point_of_sale/point_of_sale.py:53 #, python-format msgid "In order to delete a sale, it must be new or cancelled." -msgstr "" +msgstr "Um einen Verkauf zu löschen muss diese neu oder storniert sein." #. module: point_of_sale #: view:pos.confirm:0 msgid "Generate Entries" -msgstr "" +msgstr "Erzeuge Buchungen" #. module: point_of_sale #: field:pos.box.entries,product_id:0 @@ -1634,6 +1656,8 @@ msgid "" "This field authorize the automatic creation of the cashbox, without control " "of the initial balance." msgstr "" +"Dieses Feld erlaubt das Erstellen von Kassenladen ohne Prüfung der " +"Eröffnungsbilanz." #. module: point_of_sale #: report:pos.invoice:0 @@ -1645,18 +1669,19 @@ msgstr "Lieferantenrechnung" #: selection:pos.order,state:0 #: selection:report.pos.order,state:0 msgid "New" -msgstr "" +msgstr "Neu" #. module: point_of_sale #: code:addons/point_of_sale/point_of_sale.py:226 #, python-format msgid "In order to set to draft a sale, it must be cancelled." msgstr "" +"Um einen Verkauf auf Entwurf zu setzen muss dieser vorher storniert werden." #. module: point_of_sale #: view:report.pos.order:0 msgid "Day of order date" -msgstr "" +msgstr "Tag der Bestellung" #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_point_rep @@ -1689,17 +1714,17 @@ msgstr "Startdatum" #: code:addons/point_of_sale/point_of_sale.py:241 #, python-format msgid "Unable to cancel the picking." -msgstr "" +msgstr "Lieferung nicht löschbar!" #. module: point_of_sale #: view:report.pos.order:0 msgid "POS ordered created during current month" -msgstr "" +msgstr "Kassaaufträge des laufenden Monats" #. module: point_of_sale #: view:report.pos.order:0 msgid "POS ordered created last month" -msgstr "" +msgstr "Kassaaufträge des letzen Monats" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice @@ -1717,7 +1742,7 @@ msgstr "Dezember" #: view:pos.order:0 #, python-format msgid "Return Products" -msgstr "" +msgstr "Retourelieferung für Produkte" #. module: point_of_sale #: view:pos.box.out:0 @@ -1775,7 +1800,7 @@ msgstr "Rabatthinweis" #. module: point_of_sale #: view:pos.order:0 msgid "Re-Print" -msgstr "" +msgstr "Wiederhole Ausdruck" #. module: point_of_sale #: view:report.cash.register:0 @@ -1821,6 +1846,8 @@ msgid "" "Payment methods are defined by accounting journals having the field Payment " "Method checked." msgstr "" +"Zahlungswege werden in jenen Buchungsjournalen definiert, die das Feld " +"Zahlungsweg markiert haben." #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree @@ -1856,6 +1883,8 @@ msgid "" "Generate all sale journal entries for non invoiced orders linked to a closed " "cash register or statement." msgstr "" +"Erzeuge Einträge des Verkaufsjournals für alle nicht fakturierten " +"Bestellungen, die zu einer abgeschlossen Registrierkasse oder Belege gehören." #. module: point_of_sale #: code:addons/point_of_sale/point_of_sale.py:346 @@ -1871,7 +1900,7 @@ msgstr "Verkauf Journal" #. module: point_of_sale #: view:pos.close.statement:0 msgid "Do you want to close your cash registers ?" -msgstr "" +msgstr "Wollen Sie die Registrierkassen schließen?" #. module: point_of_sale #: report:pos.invoice:0 @@ -1908,7 +1937,7 @@ msgstr "Rabatt(%)" #. module: point_of_sale #: view:pos.order:0 msgid "General Information" -msgstr "" +msgstr "Allgemeine Informationen" #. module: point_of_sale #: view:pos.details:0 @@ -1927,7 +1956,7 @@ msgstr "Auftragszeilen" #. module: point_of_sale #: view:account.journal:0 msgid "Extended Configuration" -msgstr "" +msgstr "Erweiterte Konfiguration" #. module: point_of_sale #: field:pos.order.line,price_subtotal:0 @@ -1957,7 +1986,7 @@ msgstr "Heutige Verkäufe nach Benutzer" #. module: point_of_sale #: report:pos.invoice:0 msgid "Customer Code" -msgstr "" +msgstr "Kundennummer" #. module: point_of_sale #: code:addons/point_of_sale/wizard/pos_box_out.py:87 @@ -1986,7 +2015,7 @@ msgstr "Zahlungspositionen" #. module: point_of_sale #: view:pos.order:0 msgid "Yesterday" -msgstr "" +msgstr "Gestern" #. module: point_of_sale #: field:pos.order,note:0 @@ -1996,7 +2025,7 @@ msgstr "Interner Hinweis" #. module: point_of_sale #: view:pos.box.out:0 msgid "Describe why you take money from the cash register:" -msgstr "" +msgstr "Nennen Sie den Grund für die Geldentnahme" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_order_all @@ -2055,11 +2084,13 @@ msgid "" "Check this box if this journal define a payment method that can be used in " "point of sales." msgstr "" +"Markieren Sie dieses Feld, wenn dieses Journal als Zahlungsweg im " +"Kassensystem verwendet wird." #. module: point_of_sale #: field:pos.category,sequence:0 msgid "Sequence" -msgstr "" +msgstr "Sequenz" #. module: point_of_sale #: code:addons/point_of_sale/wizard/pos_return.py:316 @@ -2071,7 +2102,7 @@ msgstr "Erfasse Zahlung" #. module: point_of_sale #: constraint:pos.category:0 msgid "Error ! You cannot create recursive categories." -msgstr "" +msgstr "Fehler! Rekursive Kategorien sind nicht zulässig" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_sales_user_today @@ -2081,12 +2112,12 @@ msgstr "Verkäufer Heute" #. module: point_of_sale #: view:report.pos.order:0 msgid "Month of order date" -msgstr "" +msgstr "Monat der Bestellung" #. module: point_of_sale #: field:product.product,income_pdt:0 msgid "PoS Cash Input" -msgstr "" +msgstr "Kassa Geld Einzahlung" #. module: point_of_sale #: view:report.cash.register:0 diff --git a/addons/stock/i18n/de.po b/addons/stock/i18n/de.po index fef6bc55b4e..e8c02025718 100644 --- a/addons/stock/i18n/de.po +++ b/addons/stock/i18n/de.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-23 09:54+0000\n" -"PO-Revision-Date: 2012-01-15 09:16+0000\n" +"PO-Revision-Date: 2012-01-22 21:26+0000\n" "Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-16 05:18+0000\n" -"X-Generator: Launchpad (build 14664)\n" +"X-Launchpad-Export-Date: 2012-01-23 05:20+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: stock #: field:product.product,track_outgoing:0 @@ -706,6 +706,9 @@ msgid "" "according to the original purchase order. You can validate the shipment " "totally or partially." msgstr "" +"Die eingehenden Lieferungen besteht aus allen Bestellaufträgen an Ihre " +"Lieferanten. Sie bestehen aus einer Liste von Produkten basierende auf der " +"Originalbestellung. Sie können diese ganz oder teilweise validieren." #. module: stock #: field:stock.move.split.lines,wizard_exist_id:0