[MERGE] merge bzr server branch
This commit is contained in:
Christophe Simonis
commit
528d04d6dd
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-server\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:35+0000\n"
|
||||
"PO-Revision-Date: 2014-05-01 14:38+0000\n"
|
||||
"Last-Translator: Rudolf Schnapka <rs@techno-flex.de>\n"
|
||||
"PO-Revision-Date: 2014-05-17 09:03+0000\n"
|
||||
"Last-Translator: Ralf Hilgenstock <rh@dialoge.info>\n"
|
||||
"Language-Team: German <de@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2014-05-02 06:45+0000\n"
|
||||
"X-Generator: Launchpad (build 16985)\n"
|
||||
"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
|
||||
"X-Generator: Launchpad (build 17007)\n"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.module.module,description:base.module_account_check_writing
|
||||
|
|
@ -527,7 +527,7 @@ msgstr ""
|
|||
#: code:addons/orm.py:2649
|
||||
#, python-format
|
||||
msgid "Invalid group_by"
|
||||
msgstr "Fehler bei group_by Argument"
|
||||
msgstr "Ungültiges group_by Argument"
|
||||
|
||||
#. module: base
|
||||
#: field:ir.module.category,child_ids:0
|
||||
|
|
@ -549,7 +549,7 @@ msgstr "Langzeitprojekt Portal"
|
|||
#: field:ir.model.data,date_update:0
|
||||
#: field:ir.model.relation,date_update:0
|
||||
msgid "Update Date"
|
||||
msgstr "Update des Datums"
|
||||
msgstr "Datum aktualisieren"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_base_action_rule
|
||||
|
|
@ -819,7 +819,7 @@ msgstr "Verkauf & Einkauf"
|
|||
#. module: base
|
||||
#: view:res.partner:0
|
||||
msgid "Put an internal note..."
|
||||
msgstr "Eine Mitteilung verfassen"
|
||||
msgstr "Eine interne Mitteilung verfassen"
|
||||
|
||||
#. module: base
|
||||
#: view:ir.translation:0
|
||||
|
|
@ -6874,7 +6874,7 @@ msgstr "Isle of Man"
|
|||
#. module: base
|
||||
#: help:ir.actions.client,res_model:0
|
||||
msgid "Optional model, mostly used for needactions."
|
||||
msgstr "Dieses ist ein optionales Krokodil"
|
||||
msgstr "Optionales Modell, meist für Bedarfsaktionen verwandt"
|
||||
|
||||
#. module: base
|
||||
#: code:addons/base/module/module.py:306
|
||||
|
|
@ -6895,7 +6895,7 @@ msgstr "Bedingungstyp"
|
|||
#. module: base
|
||||
#: field:res.company,child_ids:0
|
||||
msgid "Child Companies"
|
||||
msgstr "untergeordnete Gesellschaften"
|
||||
msgstr "Tochterunternehmen"
|
||||
|
||||
#. module: base
|
||||
#: model:res.country,name:base.ni
|
||||
|
|
@ -9570,7 +9570,7 @@ msgstr "Nächste Nummer dieser Sequenz"
|
|||
#: view:res.partner:0
|
||||
#: view:res.users:0
|
||||
msgid "Tags..."
|
||||
msgstr "Tags..."
|
||||
msgstr "Schlagworte …"
|
||||
|
||||
#. module: base
|
||||
#: view:res.partner:0
|
||||
|
|
@ -10555,7 +10555,7 @@ msgstr "Zielobjekt"
|
|||
#. module: base
|
||||
#: selection:ir.model.fields,select_level:0
|
||||
msgid "Always Searchable"
|
||||
msgstr "immer eine Suche anzeigen"
|
||||
msgstr "Immer durchsuchbar"
|
||||
|
||||
#. module: base
|
||||
#: help:res.country.state,code:0
|
||||
|
|
@ -12003,7 +12003,7 @@ msgstr "Beim Entfernen"
|
|||
#: code:addons/base/ir/ir_model.py:347
|
||||
#, python-format
|
||||
msgid "Model %s does not exist!"
|
||||
msgstr "Modul %s existiert nicht!"
|
||||
msgstr "Modell %s existiert nicht!"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_mrp_jit
|
||||
|
|
@ -12172,7 +12172,7 @@ msgstr "Island"
|
|||
#: model:ir.actions.act_window,name:base.ir_action_window
|
||||
#: model:ir.ui.menu,name:base.menu_ir_action_window
|
||||
msgid "Window Actions"
|
||||
msgstr "Schließe/Öffne Fenster..."
|
||||
msgstr "Fenster öffnen/schließen …"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.module.module,description:base.module_portal_project_issue
|
||||
|
|
@ -12185,8 +12185,8 @@ msgid ""
|
|||
" "
|
||||
msgstr ""
|
||||
"\n"
|
||||
"Diese Anwendung fügt Ihrem Portal ein Menü und Funktionen für Probleme "
|
||||
"hinzu, wenn project_issue und das Portal installiert sind.\n"
|
||||
"Diese Anwendung fügt Ihrem Portal ein Menü und Funktionen hinzu, wenn "
|
||||
"project_issue und das Portal installiert sind.\n"
|
||||
"============================================================================="
|
||||
"=====================\n"
|
||||
" "
|
||||
|
|
@ -13951,7 +13951,7 @@ msgstr "Mehrstufig"
|
|||
#. module: base
|
||||
#: model:ir.module.module,summary:base.module_crm
|
||||
msgid "Leads, Opportunities, Phone Calls"
|
||||
msgstr "Leads, Opportunities, Telefonate"
|
||||
msgstr "Leads, Chancen, Telefonate"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.module.category,description:base.module_category_knowledge_management
|
||||
|
|
@ -14087,7 +14087,7 @@ msgstr ""
|
|||
#. module: base
|
||||
#: view:ir.module.module:0
|
||||
msgid "Search modules"
|
||||
msgstr "Suche Module"
|
||||
msgstr "Suche nach Modulen"
|
||||
|
||||
#. module: base
|
||||
#: model:res.country,name:base.by
|
||||
|
|
@ -14251,12 +14251,12 @@ msgstr "Markieren, wenn der Kontakt ein Kunde ist."
|
|||
#. module: base
|
||||
#: view:ir.actions.server:0
|
||||
msgid "Trigger Configuration"
|
||||
msgstr "Auslösung konfigurieren"
|
||||
msgstr "Auslöser konfigurieren"
|
||||
|
||||
#. module: base
|
||||
#: view:base.language.install:0
|
||||
msgid "Load"
|
||||
msgstr "Lade"
|
||||
msgstr "Laden"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.module.module,description:base.module_warning
|
||||
|
|
@ -14349,7 +14349,7 @@ msgstr "An"
|
|||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_hr
|
||||
msgid "Employee Directory"
|
||||
msgstr "Angestelltenverzeichnis"
|
||||
msgstr "Mitarbeiterverzeichnis"
|
||||
|
||||
#. module: base
|
||||
#: field:ir.cron,args:0
|
||||
|
|
@ -14764,7 +14764,7 @@ msgstr "Minute: %(min)s"
|
|||
#. module: base
|
||||
#: model:ir.ui.menu,name:base.menu_ir_cron
|
||||
msgid "Scheduler"
|
||||
msgstr "Scheduler"
|
||||
msgstr "Terminplaner"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.module.module,description:base.module_event_moodle
|
||||
|
|
@ -16421,7 +16421,7 @@ msgstr "Startaktion"
|
|||
#: field:ir.model,modules:0
|
||||
#: field:ir.model.fields,modules:0
|
||||
msgid "In Modules"
|
||||
msgstr "In Anwendungen"
|
||||
msgstr "In Modulen"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_contacts
|
||||
|
|
@ -16946,7 +16946,7 @@ msgstr ""
|
|||
#. module: base
|
||||
#: view:ir.rule:0
|
||||
msgid "Record rules"
|
||||
msgstr "Aufzeichnung Regel"
|
||||
msgstr "Regel aufzeichnen"
|
||||
|
||||
#. module: base
|
||||
#: help:workflow.transition,act_to:0
|
||||
|
|
@ -18107,7 +18107,7 @@ msgstr ""
|
|||
#: field:ir.model,access_ids:0
|
||||
#: view:ir.model.access:0
|
||||
msgid "Access"
|
||||
msgstr "Datenzugriffsfehler"
|
||||
msgstr "Zugriff"
|
||||
|
||||
#. module: base
|
||||
#: code:addons/base/res/res_company.py:165
|
||||
|
|
@ -18539,7 +18539,7 @@ msgstr "Land"
|
|||
#. module: base
|
||||
#: model:res.partner.category,name:base.res_partner_category_15
|
||||
msgid "Wholesaler"
|
||||
msgstr "Wiederverkäufer"
|
||||
msgstr "Großhändler"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_base_vat
|
||||
|
|
@ -18958,7 +18958,7 @@ msgstr ""
|
|||
#. module: base
|
||||
#: field:ir.actions.server,mobile:0
|
||||
msgid "Mobile No"
|
||||
msgstr "Handy-Nr."
|
||||
msgstr "Mobil-Nummer"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.actions.act_window,name:base.action_partner_by_category
|
||||
|
|
@ -18982,12 +18982,12 @@ msgstr "SXW Inhalt"
|
|||
#. module: base
|
||||
#: field:ir.attachment,file_size:0
|
||||
msgid "File Size"
|
||||
msgstr "Datei Grösse"
|
||||
msgstr "Dateigröße"
|
||||
|
||||
#. module: base
|
||||
#: help:ir.sequence,prefix:0
|
||||
msgid "Prefix value of the record for the sequence"
|
||||
msgstr "Präfix einer Folgen"
|
||||
msgstr "Präfixwert des Datensatzes für Sequenz"
|
||||
|
||||
#. module: base
|
||||
#: model:res.country,name:base.sc
|
||||
|
|
@ -19208,8 +19208,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Verwalten Sie Ihre Beziehungen zu Interessenten und Kunden. Nutzen Sie dabei "
|
||||
"\r\n"
|
||||
"Leads = Vorverhandlungen, \r\n"
|
||||
"Opportunities = Gelegenheiten, \r\n"
|
||||
"Leads = Interessenten, Vorverhandlungen, \r\n"
|
||||
"Opportunities = Chancen, Gelegenheiten, \r\n"
|
||||
"Requests = Anfragen oder \r\n"
|
||||
"Issues = Problembearbeitungen."
|
||||
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-server\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:35+0000\n"
|
||||
"PO-Revision-Date: 2014-01-03 14:00+0000\n"
|
||||
"PO-Revision-Date: 2014-05-13 01:13+0000\n"
|
||||
"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
|
||||
"Language-Team: Spanish <es@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2014-04-30 06:55+0000\n"
|
||||
"X-Generator: Launchpad (build 16985)\n"
|
||||
"X-Launchpad-Export-Date: 2014-05-14 06:20+0000\n"
|
||||
"X-Generator: Launchpad (build 17002)\n"
|
||||
|
||||
#. module: base
|
||||
#: help:ir.actions.act_window,res_id:0
|
||||
|
|
@ -1370,7 +1370,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"\n"
|
||||
"El genérico de OpenERP para la gestión de relaciones con el cliente (CRM)\n"
|
||||
"==========================================================\n"
|
||||
"=========================================================================\n"
|
||||
"\n"
|
||||
"Esta aplicación permite que grupo de personas gestione iniciativas de forma "
|
||||
"inteligente y eficaz, oportunidades, reuniones y llamadas.\n"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-server\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:35+0000\n"
|
||||
"PO-Revision-Date: 2013-07-04 05:49+0000\n"
|
||||
"Last-Translator: Hung Tran <vanda6688@yahoo.com>\n"
|
||||
"PO-Revision-Date: 2014-05-18 08:52+0000\n"
|
||||
"Last-Translator: Mai Đăng Thành <Unknown>\n"
|
||||
"Language-Team: Vietnamese <vi@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2014-04-30 06:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16985)\n"
|
||||
"X-Launchpad-Export-Date: 2014-05-19 06:20+0000\n"
|
||||
"X-Generator: Launchpad (build 17007)\n"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.module.module,description:base.module_account_check_writing
|
||||
|
|
@ -131,6 +131,17 @@ msgid ""
|
|||
" * Product Attributes\n"
|
||||
" "
|
||||
msgstr ""
|
||||
"\n"
|
||||
"Chức năng thêm nhà các sản xuất và các thuộc tính của sản phẩm\n"
|
||||
"====================================================================\n"
|
||||
"\n"
|
||||
"Bạn có thể thêm các thông tin sau cho sản phẩm:\n"
|
||||
"-----------------------------------------------\n"
|
||||
" * Nhà sản xuất\n"
|
||||
" * Tên sản phẩm (Nhà sản xuất)\n"
|
||||
" * Mã sản phẩm (Nhà sản xuất)\n"
|
||||
" * Các thuộc tính sản phẩm\n"
|
||||
" "
|
||||
|
||||
#. module: base
|
||||
#: field:ir.actions.client,params:0
|
||||
|
|
@ -203,6 +214,14 @@ msgid ""
|
|||
"revenue\n"
|
||||
"reports."
|
||||
msgstr ""
|
||||
"\n"
|
||||
"Tạo hóa đơn từ Chi phí, Bảng chấm công\n"
|
||||
"========================================================\n"
|
||||
"\n"
|
||||
"Chức năng tạo hóa đơn dựa trên chi phí (nhân lực, chi phí, ...).\n"
|
||||
"\n"
|
||||
"Bạn có thể định nghĩa bảng giá trong tài khoản phân tích, tạo báo cáo \n"
|
||||
"doanh thu lý thuyết."
|
||||
|
||||
#. module: base
|
||||
#: code:addons/base/ir/ir_sequence.py:134
|
||||
|
|
@ -379,6 +398,7 @@ msgid ""
|
|||
"The internal user that is in charge of communicating with this contact if "
|
||||
"any."
|
||||
msgstr ""
|
||||
"Người sử dụng nội bộ có trách nhiệm giao tiếp với các đối tác này nếu có."
|
||||
|
||||
#. module: base
|
||||
#: view:res.partner:0
|
||||
|
|
@ -417,6 +437,12 @@ msgid ""
|
|||
" - tree_but_open\n"
|
||||
"For defaults, an optional condition"
|
||||
msgstr ""
|
||||
"Những tác vụ sau được phép: \n"
|
||||
" - client_action_multi\n"
|
||||
" - client_print_multi\n"
|
||||
" - client_action_relate\n"
|
||||
" - tree_but_open\n"
|
||||
"Mặc định, một tùy chọn sẽ bắt buộc"
|
||||
|
||||
#. module: base
|
||||
#: sql_constraint:res.lang:0
|
||||
|
|
|
|||
|
|
@ -351,6 +351,8 @@ class ir_model_fields(osv.osv):
|
|||
raise except_orm(_('Error'), _("Model %s does not exist!") % vals['relation'])
|
||||
|
||||
if self.pool.get(vals['model']):
|
||||
if vals['model'].startswith('x_') and vals['name'] == 'x_name':
|
||||
self.pool[vals['model']]._rec_name = 'x_name'
|
||||
self.pool.get(vals['model']).__init__(self.pool, cr)
|
||||
#Added context to _auto_init for special treatment to custom field for select_level
|
||||
ctx = dict(context,
|
||||
|
|
|
|||
|
|
@ -4067,9 +4067,13 @@ class BaseModel(object):
|
|||
ir_values_obj.unlink(cr, uid, ir_value_ids, context=context)
|
||||
|
||||
for order, object, store_ids, fields in result_store:
|
||||
if object != self._name:
|
||||
if object == self._name:
|
||||
effective_store_ids = list(set(store_ids) - set(ids))
|
||||
else:
|
||||
effective_store_ids = store_ids
|
||||
if effective_store_ids:
|
||||
obj = self.pool.get(object)
|
||||
cr.execute('select id from '+obj._table+' where id IN %s', (tuple(store_ids),))
|
||||
cr.execute('select id from '+obj._table+' where id IN %s', (tuple(effective_store_ids),))
|
||||
rids = map(lambda x: x[0], cr.fetchall())
|
||||
if rids:
|
||||
obj._store_set_values(cr, uid, rids, fields, context)
|
||||
|
|
|
|||
Loading…
Reference in New Issue