diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py
index a353344190f..393e7651bda 100644
--- a/openerp/addons/base/__openerp__.py
+++ b/openerp/addons/base/__openerp__.py
@@ -58,7 +58,6 @@
'module/wizard/base_update_translations_view.xml',
'res/res_request_view.xml',
'res/res_lang_view.xml',
- 'res/res_log_view.xml',
'res/res_partner_report.xml',
'res/res_partner_view.xml',
'res/res_partner_shortcut_data.xml',
diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index 85d92106fc8..8a46c985dad 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -85,7 +85,7 @@
-
+
@@ -94,7 +94,7 @@
-
+
@@ -128,11 +128,11 @@
-
+
-
+
diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po
index ba4d173a91a..57b389f55df 100644
--- a/openerp/addons/base/i18n/cs.po
+++ b/openerp/addons/base/i18n/cs.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: openobject-server\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2012-04-03 07:54+0000\n"
+"PO-Revision-Date: 2012-04-05 13:24+0000\n"
"Last-Translator: Jiří Hajda \n"
-"Language-Team: openerp-i18n-czech \n"
+"Language-Team: openerp-i18n-czech \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-04 04:40+0000\n"
-"X-Generator: Launchpad (build 15055)\n"
+"X-Launchpad-Export-Date: 2012-04-06 04:36+0000\n"
+"X-Generator: Launchpad (build 15060)\n"
"X-Poedit-Language: Czech\n"
#. module: base
@@ -280,7 +280,7 @@ msgstr "Správa prodeje"
#. module: base
#: view:res.partner:0
msgid "Search Partner"
-msgstr "Hledat společníka"
+msgstr "Hledat partnera"
#. module: base
#: code:addons/base/module/wizard/base_export_language.py:60
@@ -910,7 +910,7 @@ msgstr ""
#. module: base
#: model:res.partner.category,name:base.res_partner_category_4
msgid "Basic Partner"
-msgstr "Základní společník"
+msgstr "Základní partner"
#. module: base
#: report:ir.module.reference.graph:0
@@ -920,7 +920,7 @@ msgstr ","
#. module: base
#: view:res.partner:0
msgid "My Partners"
-msgstr "Moji společníci"
+msgstr "Moji partneři"
#. module: base
#: view:ir.actions.report.xml:0
@@ -1048,6 +1048,8 @@ msgstr "Archív TGZ"
msgid ""
"Users added to this group are automatically added in the following groups."
msgstr ""
+"Uživatelé přidány do této skupiny jsou automaticky přidány do následujících "
+"skupin."
#. module: base
#: view:res.lang:0
@@ -1309,7 +1311,7 @@ msgstr ""
#. module: base
#: field:ir.module.category,parent_id:0
msgid "Parent Application"
-msgstr ""
+msgstr "Nadřazená aplikace"
#. module: base
#: code:addons/base/res/res_users.py:222
@@ -1551,7 +1553,7 @@ msgstr "Přihlášovací jméno"
#: model:ir.actions.act_window,name:base.action_wizard_update_translations
#: model:ir.ui.menu,name:base.menu_wizard_update_translations
msgid "Synchronize Terms"
-msgstr ""
+msgstr "Synchronizovat termíny"
#. module: base
#: view:ir.actions.server:0
@@ -1834,12 +1836,12 @@ msgstr "Firemní proces"
#. module: base
#: help:ir.cron,function:0
msgid "Name of the method to be called when this job is processed."
-msgstr ""
+msgstr "Jméno metody, která má být volán, když je zpracována tato úloha."
#. module: base
#: model:ir.module.module,shortdesc:base.module_hr_evaluation
msgid "Employee Appraisals"
-msgstr ""
+msgstr "Posouzení zaměstnance"
#. module: base
#: selection:ir.actions.server,state:0
@@ -1868,7 +1870,7 @@ msgstr "7. %H:%M:%S ==> 18:25:20"
#: view:res.partner.category:0
#: field:res.partner.category,partner_ids:0
msgid "Partners"
-msgstr "Společníci"
+msgstr "Partneři"
#. module: base
#: field:res.partner.category,parent_left:0
@@ -1878,7 +1880,7 @@ msgstr "Levý rodič"
#. module: base
#: model:ir.module.module,shortdesc:base.module_project_mrp
msgid "Create Tasks on SO"
-msgstr ""
+msgstr "Vytvořit úlokoly nad SO"
#. module: base
#: field:ir.attachment,res_model:0
@@ -1888,7 +1890,7 @@ msgstr "Přiložený model"
#. module: base
#: field:res.partner.bank,footer:0
msgid "Display on Reports"
-msgstr ""
+msgstr "Zobrazit výkazy"
#. module: base
#: model:ir.module.module,description:base.module_l10n_cn
@@ -1899,6 +1901,11 @@ msgid ""
" ============================================================\n"
" "
msgstr ""
+"\n"
+" 添加中文省份数据\n"
+" 科目类型\\会计科目表模板\\增值税\\辅助核算类别\\管理会计凭证簿\\财务会计凭证簿\n"
+" ============================================================\n"
+" "
#. module: base
#: model:ir.model,name:base.model_ir_model_access
@@ -1951,6 +1958,13 @@ msgid ""
"Accounting chart and localization for Ecuador.\n"
" "
msgstr ""
+"\n"
+"Toto je základní modul ke správě účtové osnovy v OpenERP pro Ekvádor.\n"
+"============================================================================="
+"=\n"
+"\n"
+"Účtová osnova a lokalizace pro Ekvádor.\n"
+" "
#. module: base
#: code:addons/base/ir/ir_filters.py:38
@@ -2190,12 +2204,12 @@ msgstr ""
#. module: base
#: field:ir.values,action_id:0
msgid "Action (change only)"
-msgstr ""
+msgstr "Akce (pouze změnit)"
#. module: base
#: model:ir.module.module,shortdesc:base.module_subscription
msgid "Recurring Documents"
-msgstr ""
+msgstr "Opakující se dokumenty"
#. module: base
#: model:res.country,name:base.bs
@@ -2257,7 +2271,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_base_setup
msgid "Initial Setup Tools"
-msgstr ""
+msgstr "Nástroje prvotního nastavení"
#. module: base
#: field:ir.actions.act_window,groups_id:0
@@ -2319,7 +2333,7 @@ msgstr "Správa pomůcek domovské stránky"
#. module: base
#: field:res.company,rml_header1:0
msgid "Report Header / Company Slogan"
-msgstr ""
+msgstr "Hlavička výkazu / slogan firmy"
#. module: base
#: model:res.country,name:base.pl
@@ -2796,7 +2810,7 @@ msgid ""
"you are working on will be maintained."
msgstr ""
"Zobrazit nebo spravovat seznam všech zemí, které mohou být přiřazeny k "
-"záznamům vašich společníků. Můžete vytvořit nebo odstranit země, abyste se "
+"záznamům vašich partnerů. Můžete vytvořit nebo odstranit země, abyste se "
"ujistili, že ty, se kterými pracujete budou udržována."
#. module: base
@@ -3052,7 +3066,7 @@ msgstr "Kalendář"
#. module: base
#: field:res.partner.address,partner_id:0
msgid "Partner Name"
-msgstr "Jméno společníka"
+msgstr "Jméno partnera"
#. module: base
#: field:workflow.activity,signal_send:0
@@ -3649,7 +3663,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_point_of_sale
msgid "Point Of Sale"
-msgstr ""
+msgstr "Obchodní místa"
#. module: base
#: code:addons/base/module/module.py:302
@@ -3666,7 +3680,7 @@ msgid ""
msgstr ""
"Tento průvodce vám pomůže přidat nový jazyk do vašeho systému OpenERP. Po "
"načtení nového jazyka bude dostupný jako výchozí jazyk rozhraní pro "
-"uživatele a společníky."
+"uživatele a partnery."
#. module: base
#: view:ir.model:0
@@ -3685,7 +3699,7 @@ msgstr ""
#. module: base
#: selection:ir.sequence,implementation:0
msgid "Standard"
-msgstr ""
+msgstr "Běžný"
#. module: base
#: model:ir.model,name:base.model_maintenance_contract
@@ -3903,12 +3917,12 @@ msgstr "Černá Hora"
#. module: base
#: model:ir.module.module,shortdesc:base.module_document_ics
msgid "iCal Support"
-msgstr ""
+msgstr "Podpora iCal"
#. module: base
#: model:ir.module.module,shortdesc:base.module_fetchmail
msgid "Email Gateway"
-msgstr ""
+msgstr "Poštovní brána"
#. module: base
#: code:addons/base/ir/ir_mail_server.py:439
@@ -3917,6 +3931,8 @@ msgid ""
"Mail delivery failed via SMTP server '%s'.\n"
"%s: %s"
msgstr ""
+"Doručení pošty přes server SMTP '%s' selhalo.\n"
+"%s: %s"
#. module: base
#: view:ir.cron:0
@@ -4089,7 +4105,7 @@ msgstr "Popis akce"
#. module: base
#: help:res.partner,customer:0
msgid "Check this box if the partner is a customer."
-msgstr "Zaškrtněte toto pole pokud je společník zákazníkem."
+msgstr "Zaškrtněte toto pole pokud je partner zákazníkem."
#. module: base
#: help:ir.module.module,auto_install:0
@@ -5277,13 +5293,13 @@ msgid ""
"The internal user that is in charge of communicating with this partner if "
"any."
msgstr ""
-"Vnitřní uživatel, který má pověření komunikovat s tímto společníkem, pokud "
+"Vnitřní uživatel, který má pověření komunikovat s tímto partnerem, pokud "
"nějaký je."
#. module: base
#: field:res.partner,parent_id:0
msgid "Parent Partner"
-msgstr "Rodičovský společník"
+msgstr "Nadřazený partner"
#. module: base
#: view:ir.module.module:0
@@ -5433,7 +5449,7 @@ msgstr ""
#. module: base
#: model:res.partner.category,name:base.res_partner_category_3
msgid "Starter Partner"
-msgstr "Počáteční společník"
+msgstr "Počáteční partner"
#. module: base
#: help:ir.model.fields,relation_field:0
@@ -5870,7 +5886,7 @@ msgstr "Vlastník bankovního účtu"
#. module: base
#: model:ir.module.category,name:base.module_category_uncategorized
msgid "Uncategorized"
-msgstr ""
+msgstr "Bez kategorie"
#. module: base
#: field:ir.attachment,res_name:0
@@ -6008,7 +6024,7 @@ msgstr "Nastavení akcí klienta"
#: model:ir.model,name:base.model_res_partner_address
#: view:res.partner.address:0
msgid "Partner Addresses"
-msgstr "Adresy společníků"
+msgstr "Adresy partnerů"
#. module: base
#: help:ir.mail_server,smtp_debug:0
@@ -6025,7 +6041,7 @@ msgstr ""
#. module: base
#: selection:ir.actions.todo,type:0
msgid "Launch Automatically"
-msgstr ""
+msgstr "Spustit automaticky"
#. module: base
#: model:ir.module.module,description:base.module_mail
@@ -6158,12 +6174,12 @@ msgstr ""
#: code:addons/base/module/module.py:392
#, python-format
msgid "Uninstall"
-msgstr ""
+msgstr "Odinstalovat"
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_budget
msgid "Budgets Management"
-msgstr ""
+msgstr "Správa rozpočtu"
#. module: base
#: field:workflow.triggers,workitem_id:0
@@ -6178,12 +6194,12 @@ msgstr ""
#. module: base
#: selection:ir.mail_server,smtp_encryption:0
msgid "SSL/TLS"
-msgstr ""
+msgstr "SSL/TLS"
#. module: base
#: field:publisher_warranty.contract,check_opw:0
msgid "OPW"
-msgstr ""
+msgstr "OPW"
#. module: base
#: field:res.log,secondary:0
@@ -6295,7 +6311,7 @@ msgstr "Súdán"
#: field:res.currency.rate,currency_rate_type_id:0
#: view:res.currency.rate.type:0
msgid "Currency Rate Type"
-msgstr ""
+msgstr "Typ násobku měny"
#. module: base
#: model:res.country,name:base.fm
@@ -6316,12 +6332,12 @@ msgstr "Nabídky"
#. module: base
#: selection:ir.actions.todo,type:0
msgid "Launch Manually Once"
-msgstr ""
+msgstr "Jednou ručně spustit"
#. module: base
#: model:ir.module.category,name:base.module_category_hidden
msgid "Hidden"
-msgstr ""
+msgstr "Skryté"
#. module: base
#: selection:base.language.install,lang:0
@@ -6447,7 +6463,7 @@ msgstr "Mapování objektů"
#. module: base
#: field:ir.ui.view,xml_id:0
msgid "External ID"
-msgstr ""
+msgstr "Vnější ID"
#. module: base
#: help:res.currency.rate,rate:0
@@ -6484,7 +6500,7 @@ msgstr "Botswana"
#: model:ir.ui.menu,name:base.menu_partner_title_partner
#: view:res.partner.title:0
msgid "Partner Titles"
-msgstr "Jména společníků"
+msgstr "Jména partnerů"
#. module: base
#: help:ir.actions.act_window,auto_refresh:0
@@ -6494,12 +6510,12 @@ msgstr "Přidá automatické obnovení u pohledu"
#. module: base
#: help:res.partner,employee:0
msgid "Check this box if the partner is an Employee."
-msgstr "Zaškrtněte toto políčko pokud je společník zaměstnanec."
+msgstr "Zaškrtněte toto políčko pokud je partner zaměstnanec."
#. module: base
#: model:ir.module.module,shortdesc:base.module_crm_profiling
msgid "Customer Profiling"
-msgstr ""
+msgstr "Analýza zákazníka"
#. module: base
#: model:ir.module.module,shortdesc:base.module_project_issue
@@ -6514,7 +6530,7 @@ msgstr "Pracovní dny"
#. module: base
#: model:ir.module.module,shortdesc:base.module_multi_company
msgid "Multi-Company"
-msgstr ""
+msgstr "Více-společností"
#. module: base
#: field:ir.actions.report.xml,report_rml_content:0
@@ -6544,14 +6560,14 @@ msgstr "Rada"
#. module: base
#: view:res.company:0
msgid "Header/Footer of Reports"
-msgstr ""
+msgstr "Záhlaví/zápatí výkazu"
#. module: base
#: code:addons/base/res/res_users.py:746
#: view:res.users:0
#, python-format
msgid "Applications"
-msgstr ""
+msgstr "Aplikace"
#. module: base
#: model:ir.model,name:base.model_ir_attachment
@@ -6580,7 +6596,7 @@ msgstr ""
#. module: base
#: selection:res.currency,position:0
msgid "After Amount"
-msgstr ""
+msgstr "Po částce"
#. module: base
#: selection:base.language.install,lang:0
@@ -6626,7 +6642,7 @@ msgstr "Podmínky zdrojového kódu"
#. module: base
#: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
msgid "Timesheets Validation"
-msgstr ""
+msgstr "Ověření časového rozvrhu"
#. module: base
#: model:ir.ui.menu,name:base.menu_main_pm
@@ -6673,6 +6689,7 @@ msgstr "Kontrola"
#: help:ir.values,company_id:0
msgid "If set, action binding only applies for this company"
msgstr ""
+"Pokud je nastaveno, vazby akcí budou platit pouze pro tuto společnost"
#. module: base
#: model:res.country,name:base.lc
@@ -6770,7 +6787,7 @@ msgstr "Při mazání"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_multilang
msgid "Multi Language Chart of Accounts"
-msgstr ""
+msgstr "Více jazyčná účtová osnova"
#. module: base
#: selection:res.lang,direction:0
@@ -6806,7 +6823,7 @@ msgstr "Podpis"
#. module: base
#: model:ir.module.module,shortdesc:base.module_crm_caldav
msgid "Meetings Synchronization"
-msgstr ""
+msgstr "Synchronizace setkání"
#. module: base
#: field:ir.actions.act_window,context:0
@@ -6838,7 +6855,7 @@ msgstr "Jméno modulu musí být jedinečné !"
#. module: base
#: model:ir.module.module,shortdesc:base.module_base_contact
msgid "Contacts Management"
-msgstr ""
+msgstr "Správa kontaktů"
#. module: base
#: model:ir.module.module,description:base.module_l10n_fr_rib
@@ -6874,7 +6891,7 @@ msgstr ""
#. module: base
#: view:ir.property:0
msgid "Parameters that are used by all resources."
-msgstr ""
+msgstr "Parametry, které jsou použity pro všechny zdroje."
#. module: base
#: model:res.country,name:base.mz
@@ -6915,14 +6932,14 @@ msgstr "Obchodník"
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_accountant
msgid "Accounting and Finance"
-msgstr ""
+msgstr "Účetnictví a finance"
#. module: base
#: code:addons/base/module/module.py:429
#: view:ir.module.module:0
#, python-format
msgid "Upgrade"
-msgstr ""
+msgstr "Povýšit"
#. module: base
#: field:res.partner,address:0
@@ -6938,7 +6955,7 @@ msgstr "Faerské ostrovy"
#. module: base
#: field:ir.mail_server,smtp_encryption:0
msgid "Connection Security"
-msgstr ""
+msgstr "Zabezpečení spojení"
#. module: base
#: code:addons/base/ir/ir_actions.py:653
@@ -6953,6 +6970,9 @@ msgid ""
" United States - Chart of accounts\n"
" "
msgstr ""
+"\n"
+" Spojené státy - Účtová osnova\n"
+" "
#. module: base
#: view:res.widget.wizard:0
@@ -7007,7 +7027,7 @@ msgstr "Honduras - Účetnictví"
#. module: base
#: model:ir.module.module,shortdesc:base.module_report_intrastat
msgid "Intrastat Reporting"
-msgstr ""
+msgstr "Vykazování Intrastat"
#. module: base
#: code:addons/base/res/res_users.py:222
@@ -7084,7 +7104,7 @@ msgstr "Vytvořené nabídky"
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_analytic_default
msgid "Account Analytic Defaults"
-msgstr ""
+msgstr "Analytické výchozí hodnoty účtu"
#. module: base
#: model:ir.module.module,description:base.module_hr_contract
@@ -7148,7 +7168,7 @@ msgstr "Španělština (MX) / Español (MX)"
#: code:addons/base/publisher_warranty/publisher_warranty.py:145
#, python-format
msgid "Please verify your publisher warranty serial number and validity."
-msgstr ""
+msgstr "Prosíme ověřte vaše sériové číslo a platnost záruky vydavatele."
#. module: base
#: view:res.log:0
@@ -7204,7 +7224,7 @@ msgstr "Čtení"
#. module: base
#: model:ir.module.module,shortdesc:base.module_association
msgid "Associations Management"
-msgstr ""
+msgstr "Správa spojování"
#. module: base
#: help:ir.model,modules:0
@@ -7283,7 +7303,7 @@ msgstr ""
#. module: base
#: field:res.partner,title:0
msgid "Partner Firm"
-msgstr ""
+msgstr "Firma partnera"
#. module: base
#: model:ir.actions.act_window,name:base.action_model_fields
@@ -7515,7 +7535,7 @@ msgstr "Němčina / Nederlands"
#. module: base
#: selection:res.company,paper_format:0
msgid "US Letter"
-msgstr ""
+msgstr "Dopis US"
#. module: base
#: model:ir.module.module,description:base.module_stock_location
@@ -7627,7 +7647,7 @@ msgstr "Správa znalostí"
#. module: base
#: model:ir.actions.act_window,name:base.bank_account_update
msgid "Company Bank Accounts"
-msgstr ""
+msgstr "Bankovní účty společnosti"
#. module: base
#: help:ir.mail_server,smtp_pass:0
@@ -7689,7 +7709,7 @@ msgstr ""
#. module: base
#: model:res.partner.bank.type,name:base.bank_normal
msgid "Normal Bank Account"
-msgstr ""
+msgstr "Obyčejný bankovní účet"
#. module: base
#: view:ir.actions.wizard:0
@@ -7833,7 +7853,7 @@ msgstr ""
#. module: base
#: view:res.partner.bank:0
msgid "Bank accounts belonging to one of your companies"
-msgstr ""
+msgstr "Bankovní účty patřící k jedné z vašich společností"
#. module: base
#: help:res.users,action_id:0
@@ -7847,7 +7867,7 @@ msgstr ""
#. module: base
#: selection:ir.module.module,complexity:0
msgid "Easy"
-msgstr ""
+msgstr "Snadný"
#. module: base
#: view:ir.values:0
@@ -8121,12 +8141,12 @@ msgstr "%a - Zkrácené jméno dne v týdnu."
#. module: base
#: view:ir.ui.menu:0
msgid "Submenus"
-msgstr ""
+msgstr "Podnabídka"
#. module: base
#: model:res.groups,name:base.group_extended
msgid "Extended View"
-msgstr ""
+msgstr "Rozšířený pohled"
#. module: base
#: model:res.country,name:base.pf
@@ -8141,7 +8161,7 @@ msgstr "Dominika"
#. module: base
#: model:ir.module.module,shortdesc:base.module_base_module_record
msgid "Record and Create Modules"
-msgstr ""
+msgstr "Zaznamenává a vytváří moduly"
#. module: base
#: model:ir.model,name:base.model_partner_sms_send
@@ -8194,7 +8214,7 @@ msgstr "Cesta k XSL"
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_invoice_layout
msgid "Invoice Layouts"
-msgstr ""
+msgstr "Rozvržení faktury"
#. module: base
#: model:ir.module.module,shortdesc:base.module_stock_location
@@ -8260,7 +8280,7 @@ msgstr ""
#: model:ir.ui.menu,name:base.menu_values_form_action
#: view:ir.values:0
msgid "Action Bindings"
-msgstr ""
+msgstr "Vazba akcí"
#. module: base
#: view:ir.sequence:0
@@ -8283,7 +8303,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_account
msgid "eInvoicing"
-msgstr ""
+msgstr "eFakturace"
#. module: base
#: model:ir.module.module,description:base.module_association
@@ -8355,7 +8375,7 @@ msgstr "Znovu načíst z přílohy"
#. module: base
#: view:ir.module.module:0
msgid "Hide technical modules"
-msgstr ""
+msgstr "Skrýt technické moduly"
#. module: base
#: model:ir.module.module,description:base.module_procurement
@@ -8387,7 +8407,7 @@ msgstr "Mexiko"
#: code:addons/base/ir/ir_mail_server.py:414
#, python-format
msgid "Missing SMTP Server"
-msgstr ""
+msgstr "Chybějící server SMTP"
#. module: base
#: field:ir.attachment,name:0
@@ -8408,7 +8428,7 @@ msgstr "Instalace povýšení modulu"
#. module: base
#: model:ir.module.module,shortdesc:base.module_email_template
msgid "E-Mail Templates"
-msgstr ""
+msgstr "Šablony e-mailů"
#. module: base
#: model:ir.model,name:base.model_ir_actions_configuration_wizard
@@ -8585,7 +8605,7 @@ msgstr ""
#. module: base
#: field:res.users,date:0
msgid "Latest Connection"
-msgstr ""
+msgstr "Poslední spojení"
#. module: base
#: view:res.request.link:0
@@ -8635,22 +8655,22 @@ msgstr "Iterace"
#. module: base
#: model:ir.module.module,shortdesc:base.module_project_planning
msgid "Resources Planing"
-msgstr ""
+msgstr "Plánování zdrojů"
#. module: base
#: field:ir.module.module,complexity:0
msgid "Complexity"
-msgstr ""
+msgstr "Složitost"
#. module: base
#: selection:ir.actions.act_window,target:0
msgid "Inline"
-msgstr ""
+msgstr "Vkládaný"
#. module: base
#: model:res.partner.bank.type.field,name:base.bank_normal_field_bic
msgid "bank_bic"
-msgstr ""
+msgstr "bank_bic"
#. module: base
#: code:addons/orm.py:3988
@@ -8705,7 +8725,7 @@ msgstr ""
#. module: base
#: view:ir.values:0
msgid "Action Reference"
-msgstr ""
+msgstr "Odkaz akce"
#. module: base
#: model:res.country,name:base.re
@@ -8733,12 +8753,12 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_mrp_repair
msgid "Repairs Management"
-msgstr ""
+msgstr "Správa oprav"
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_asset
msgid "Assets Management"
-msgstr ""
+msgstr "Správa majetku"
#. module: base
#: view:ir.model.access:0
@@ -9009,7 +9029,7 @@ msgstr "Severní Mariany"
#. module: base
#: model:ir.module.module,shortdesc:base.module_claim_from_delivery
msgid "Claim on Deliveries"
-msgstr ""
+msgstr "Pohledávky na doručeních"
#. module: base
#: model:res.country,name:base.sb
@@ -9075,7 +9095,7 @@ msgstr "Překlady"
#. module: base
#: model:ir.module.module,shortdesc:base.module_project_gtd
msgid "Todo Lists"
-msgstr ""
+msgstr "Seznam úkolů"
#. module: base
#: view:ir.actions.report.xml:0
@@ -9126,7 +9146,7 @@ msgstr "Referenční příručka"
#. module: base
#: view:ir.values:0
msgid "Default Value Scope"
-msgstr ""
+msgstr "Výchozí rozsah hodnoty"
#. module: base
#: view:ir.ui.view:0
@@ -9205,6 +9225,8 @@ msgid ""
"\n"
" "
msgstr ""
+"\n"
+" "
#. module: base
#: view:ir.actions.act_window:0
@@ -9234,7 +9256,7 @@ msgstr "Datum vytvoření"
#. module: base
#: help:ir.actions.server,trigger_name:0
msgid "The workflow signal to trigger"
-msgstr ""
+msgstr "Signál pracovního toku k vyvolání"
#. module: base
#: model:ir.module.module,description:base.module_mrp
@@ -9283,7 +9305,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,description:base.module_google_base_account
msgid "The module adds google user in res user"
-msgstr ""
+msgstr "Modul přidává uživatele google v res user"
#. module: base
#: selection:base.language.install,state:0
@@ -9300,7 +9322,7 @@ msgstr "Obecná nastavení"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_uy
msgid "Uruguay - Chart of Accounts"
-msgstr ""
+msgstr "Uruguay - Účtová osnova"
#. module: base
#: model:ir.ui.menu,name:base.menu_administration_shortcut
@@ -9320,25 +9342,25 @@ msgstr "Alžírsko"
#. module: base
#: model:ir.module.module,shortdesc:base.module_plugin
msgid "CRM Plugins"
-msgstr ""
+msgstr "Doplňky CRM"
#. module: base
#: model:ir.actions.act_window,name:base.action_model_model
#: model:ir.model,name:base.model_ir_model
#: model:ir.ui.menu,name:base.ir_model_model_menu
msgid "Models"
-msgstr ""
+msgstr "Modely"
#. module: base
#: code:addons/base/ir/ir_cron.py:292
#, python-format
msgid "Record cannot be modified right now"
-msgstr ""
+msgstr "Záznam nyní nelze změnit"
#. module: base
#: selection:ir.actions.todo,type:0
msgid "Launch Manually"
-msgstr ""
+msgstr "Spustit ručně"
#. module: base
#: model:res.country,name:base.be
@@ -9348,12 +9370,12 @@ msgstr "Belgie"
#. module: base
#: view:res.company:0
msgid "Preview Header"
-msgstr ""
+msgstr "Náhled hlavičky"
#. module: base
#: field:res.company,paper_format:0
msgid "Paper Format"
-msgstr ""
+msgstr "Formát papíru"
#. module: base
#: field:base.language.export,lang:0
@@ -9453,7 +9475,7 @@ msgstr "osv_memory.autovacuum"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_us
msgid "United States - Chart of accounts"
-msgstr ""
+msgstr "Spojené státy - Účtová osnova"
#. module: base
#: view:base.language.install:0
@@ -9641,6 +9663,9 @@ msgid ""
" OpenERP Web example module.\n"
" "
msgstr ""
+"\n"
+" Příklad webového modulu OpenERP.\n"
+" "
#. module: base
#: model:res.country,name:base.gy
@@ -9650,7 +9675,7 @@ msgstr "Guyana"
#. module: base
#: model:ir.module.module,shortdesc:base.module_product_expiry
msgid "Products Expiry Date"
-msgstr ""
+msgstr "Datum vypršení výrobku"
#. module: base
#: model:ir.module.module,description:base.module_account
@@ -9776,12 +9801,12 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_base_synchro
msgid "Multi-DB Synchronization"
-msgstr ""
+msgstr "Více-DB synchronizace"
#. module: base
#: selection:ir.module.module,complexity:0
msgid "Expert"
-msgstr ""
+msgstr "Odborník"
#. module: base
#: model:ir.module.module,shortdesc:base.module_hr_holidays
@@ -9817,6 +9842,9 @@ msgid ""
"Todo list for CRM leads and opportunities.\n"
" "
msgstr ""
+"\n"
+"Seznam úkolů pro obchodní případy CRM a příležitosti.\n"
+" "
#. module: base
#: field:ir.actions.act_window.view,view_id:0
@@ -9829,7 +9857,7 @@ msgstr "Pohled"
#. module: base
#: model:ir.module.module,shortdesc:base.module_wiki_sale_faq
msgid "Wiki: Sale FAQ"
-msgstr ""
+msgstr "Wiki: Prodejní FAQ"
#. module: base
#: selection:ir.module.module,state:0
@@ -9936,7 +9964,7 @@ msgstr "Monako"
#. module: base
#: view:base.module.import:0
msgid "Please be patient, this operation may take a few minutes..."
-msgstr ""
+msgstr "Prosíme buďte trpěliví, tato operace může trvat několik minut..."
#. module: base
#: selection:ir.cron,interval_type:0
@@ -9962,12 +9990,12 @@ msgstr "Akce nahradí standardní nabídku tohoto uživatele, pokud je určeno."
#. module: base
#: model:ir.module.module,shortdesc:base.module_google_map
msgid "Google Maps on Customers"
-msgstr ""
+msgstr "Google mapy nad zákazníky"
#. module: base
#: model:ir.actions.report.xml,name:base.preview_report
msgid "Preview Report"
-msgstr ""
+msgstr "Náhled výkazu"
#. module: base
#: model:ir.module.module,shortdesc:base.module_purchase_analytic_plans
@@ -10071,17 +10099,17 @@ msgstr "Chyba !"
#. module: base
#: model:ir.module.module,shortdesc:base.module_marketing_campaign_crm_demo
msgid "Marketing Campaign - Demo"
-msgstr ""
+msgstr "Marketingové kampaně - ukázka"
#. module: base
#: model:ir.module.module,shortdesc:base.module_fetchmail_hr_recruitment
msgid "eMail Gateway for Applicants"
-msgstr ""
+msgstr "eMailová brána pro žadatele"
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_coda
msgid "Belgium - Import bank CODA statements"
-msgstr ""
+msgstr "Belgie - Import bankovního výpisu CODA"
#. module: base
#: field:ir.cron,interval_type:0
@@ -10103,7 +10131,7 @@ msgstr "Tato metoda již neexistuje"
#. module: base
#: model:ir.module.module,shortdesc:base.module_import_google
msgid "Google Import"
-msgstr ""
+msgstr "Import Google"
#. module: base
#: model:res.partner.category,name:base.res_partner_category_12
@@ -10128,7 +10156,7 @@ msgstr "Klíčová slova"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_cn
msgid "中国会计科目表 - Accounting"
-msgstr ""
+msgstr "中国会计科目表 - Účetnictví"
#. module: base
#: view:ir.model.access:0
@@ -10149,12 +10177,12 @@ msgstr ""
#. module: base
#: help:ir.model.data,res_id:0
msgid "ID of the target record in the database"
-msgstr ""
+msgstr "ID cílového záznamu v databázi"
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_analytic_analysis
msgid "Contracts Management"
-msgstr ""
+msgstr "Správa smluv"
#. module: base
#: selection:base.language.install,lang:0
@@ -10268,12 +10296,12 @@ msgstr "Název služby"
#. module: base
#: model:ir.module.module,shortdesc:base.module_import_base
msgid "Framework for complex import"
-msgstr ""
+msgstr "Systém pro složitý import"
#. module: base
#: view:ir.actions.todo.category:0
msgid "Wizard Category"
-msgstr ""
+msgstr "Kategorie průvodců"
#. module: base
#: model:ir.module.module,description:base.module_account_cancel
@@ -10391,6 +10419,12 @@ msgid ""
"Provide Templates for Chart of Accounts, Taxes for Uruguay\n"
"\n"
msgstr ""
+"\n"
+"Obecná účtová osnova\n"
+"=========================\n"
+"\n"
+"Poskytuje šablonu pro účtovou osnovu, daně pro Uruguay\n"
+"\n"
#. module: base
#: help:res.company,bank_ids:0
@@ -11250,7 +11284,7 @@ msgstr ""
#. module: base
#: model:res.partner.category,name:base.res_partner_category_2
msgid "OpenERP Partners"
-msgstr "Společníci OpenERP"
+msgstr "Partneři OpenERP"
#. module: base
#: code:addons/base/module/module.py:293
@@ -11988,7 +12022,7 @@ msgstr "Parametry, které budou předány metodě. např. (uid,)."
#. module: base
#: model:res.partner.category,name:base.res_partner_category_5
msgid "Gold Partner"
-msgstr "Zlatý společník"
+msgstr "Zlatý partner"
#. module: base
#: model:ir.model,name:base.model_res_partner
@@ -11998,7 +12032,7 @@ msgstr "Zlatý společník"
#: selection:res.partner.title,domain:0
#: model:res.request.link,name:base.req_link_partner
msgid "Partner"
-msgstr "Společník"
+msgstr "Partner"
#. module: base
#: field:ir.model.fields,complete_name:0
@@ -12369,7 +12403,7 @@ msgstr "Podmínky"
#. module: base
#: model:ir.actions.act_window,name:base.action_partner_other_form
msgid "Other Partners"
-msgstr "Jiní společníci"
+msgstr "Jiní partneři"
#. module: base
#: model:ir.actions.act_window,name:base.action_currency_form
@@ -12703,7 +12737,7 @@ msgstr "Časové sledování"
#. module: base
#: view:res.partner.category:0
msgid "Partner Category"
-msgstr "Kategorie společníků"
+msgstr "Kategorie partnerů"
#. module: base
#: view:ir.actions.server:0
@@ -13930,8 +13964,7 @@ msgstr "Zdroj"
#. module: base
#: help:res.partner.address,partner_id:0
msgid "Keep empty for a private address, not related to partner."
-msgstr ""
-"Ponechejte prázdné pro soukromou adresu nesouvisející se společníkem."
+msgstr "Ponechejte prázdné pro soukromou adresu nesouvisející se partnerem."
#. module: base
#: model:res.country,name:base.vu
@@ -14856,7 +14889,7 @@ msgstr ""
#. module: base
#: help:ir.mail_server,smtp_port:0
msgid "SMTP Port. Usually 465 for SSL, and 25 or 587 for other cases."
-msgstr ""
+msgstr "Port SMTP. Pro SSL obvykle 465 a 25 nebo 587 v jiných případech."
#. module: base
#: view:ir.sequence:0
@@ -15208,7 +15241,7 @@ msgstr "Mobilní č."
#: model:ir.ui.menu,name:base.menu_partner_category_form
#: view:res.partner.category:0
msgid "Partner Categories"
-msgstr "Kategorie společníků"
+msgstr "Kategorie partnerů"
#. module: base
#: view:base.module.upgrade:0
@@ -15351,7 +15384,7 @@ msgstr "Instance pracovních postupů"
#: code:addons/base/res/res_partner.py:284
#, python-format
msgid "Partners: "
-msgstr "Společníci: "
+msgstr "Partneři: "
#. module: base
#: field:res.partner.bank,name:0
diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index a65100e44d1..a22b7512575 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-server\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2012-04-05 00:22+0000\n"
+"PO-Revision-Date: 2012-04-06 04:31+0000\n"
"Last-Translator: Akira Hiyama \n"
"Language-Team: Japanese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-05 04:43+0000\n"
+"X-Launchpad-Export-Date: 2012-04-06 04:37+0000\n"
"X-Generator: Launchpad (build 15060)\n"
#. module: base
@@ -12245,7 +12245,7 @@ msgid ""
" "
msgstr ""
"\n"
-"タイの勘定科目表\n"
+"タイ王国の勘定科目表\n"
"===============================\n"
"\n"
"タイの会計表とローカル化\n"
@@ -14669,6 +14669,79 @@ msgid ""
"\n"
" "
msgstr ""
+"\n"
+"LDAPサーバによる認証のためのサポートを追加します。\n"
+"===============================================\n"
+"このモジュールは彼らのLDAPユーザ名とパスワードによりユーザのログインを許可します。\n"
+"そして、その場でOpenERPユーザを自動的に作成します。\n"
+"\n"
+"注記：このモジュールはPythonのLDAPモジュールをインストールしたサーバでのみ動作します。\n"
+"\n"
+"設定\n"
+"+++++++++++++\n"
+"このモジュールをインストールした後で、会社詳細の設定タブの中のLDAPパラメータの設定が\n"
+"必要です。\n"
+"異なる会社は異なるLDAPサーバを持つかもしれませんが、ユーザは固有のユーザ名を持ち\n"
+"ます。OpenERPにおけるユーザ名はたとえ複数の会社にまたがったとしても固有である必要\n"
+"があります。\n"
+"\n"
+"LDAP設定の中でLDAPユーザと空のパスワードを保つことで、LDAPの匿名認証もサポート\n"
+"されます（それを許可するLDAPサーバ）。これはユーザのための匿名認証を許可しません。\n"
+"認証を試みる前に、ユーザが存在するか確認に使用されたマスタLDAPアカウントのために\n"
+"だけ許可されます。\n"
+"\n"
+"LDAP設定のTLSオプションを使用可能にすることによって、LDAPサーバがサポートする\n"
+"STARTTLSによるセキュアな通信が使用可能になります。\n"
+"LDAPを設定するそれ以上のオプション設定は、ldap.confのマニュアルページを参照して\n"
+"下さい：ldap.conf(5)\n"
+"\n"
+"セキュリティ考慮事項\n"
+"+++++++++++++++++++++++\n"
+"ユーザのLDAPパスワードは決してOpenERPのデータベースに保存されることはありません。\n"
+"ユーザが認証されることを必要とする時はいつでもLDAPサーバに問い合わせが行われます。\n"
+"パスワードの複製は起こりません。そして、パスワードは１つの場所のみで管理されます。\n"
+"\n"
+"OpenERPはLDAPのパスワード変更の管理をしません。そのため、パスワードの変更は\n"
+"LDAPディレクトリに直接的に（LDAPユーザ用）他の方法によって処理されるべきです。\n"
+"\n"
+"LDAP認証ユーザ（管理者アカウントは1つの明示的な例）とともに、データベースにローカルの\n"
+"OpenERPユーザを持つことも可能です。\n"
+"\n"
+"それはどのように機能するか：\n"
+"\n"
+" ・ システムは最初にローカルのOpenERPデータベースに対してユーザ認証を試みます；\n"
+" ・ この認証が失敗（例えば、ユーザはローカルのパスワードを持っていない）すると、\n"
+" システムは次にLDAPに対して認証を試みます；\n"
+"\n"
+"LDAPユーザはデフォルトで空のパスワードをローカルのOpenERPデータベースに持っている\n"
+"（アクセスしないことを意味します）ので、最初のステップはいつも失敗します。そして、LDAP\n"
+"サーバは認証実行のために問い合わせられます。\n"
+"\n"
+"STARTTLSを有効にすると、LDAPサーバへの認証問い合わせは暗号化されることが\n"
+"保証されます。\n"
+"\n"
+"ユーザテンプレート\n"
+"+++++++++++++\n"
+"会社フォームのLDAP設定では、ユーザテンプレートの選択が可能です。セットした場合、\n"
+"誰かがLDAP認証経由の最初の認証をする時はいつも、このユーザがテンプレートとして\n"
+"ローカルユーザを作るために使われます。\n"
+"これは初回ユーザのデフォルトグループとメニューをあらかじめ設定することを可能にします。\n"
+"\n"
+"警告：もしユーザテンプレートのためにパスワードを設定した場合は、このパスワードは\n"
+"（手作業で変更されるまで）事実上それらのユーザのためのマスタパスワード設定であり、\n"
+"各新しいLDAPユーザのためのローカルパスワードとして割り当てられます。\n"
+"通常はこれは望まないでしょう。\n"
+"ユーザのテンプレートを設定する簡単な方法は、ひとたび有効なLDAPユーザでログインする\n"
+"ことです。OpenERPに空のローカルユーザを同じログイン名（空のパスワードで）で作らせ、\n"
+"それから、LDAPに存在しないユーザ名の新しいユーザにリネームします。そしてあなたが\n"
+"望むグループのセットアップします。\n"
+"\n"
+"base_cryptとの相互作用\n"
+"+++++++++++++++++++++++++++\n"
+"base_cryptモジュールはこのモジュールと互換性がありません。また、同時にインストール\n"
+"された場合は、LDAP認証を無効にします。\n"
+"\n"
+" "
#. module: base
#: field:res.request.history,body:0
@@ -14789,7 +14862,7 @@ msgstr "ユーザ - 全てのリード"
#. module: base
#: field:res.partner.bank,acc_number:0
msgid "Account Number"
-msgstr ""
+msgstr "口座番号"
#. module: base
#: view:ir.rule:0
@@ -14797,11 +14870,13 @@ msgid ""
"Example: GLOBAL_RULE_1 AND GLOBAL_RULE_2 AND ( (GROUP_A_RULE_1 OR "
"GROUP_A_RULE_2) OR (GROUP_B_RULE_1 OR GROUP_B_RULE_2) )"
msgstr ""
+"例：GLOBAL_RULE_1 AND GLOBAL_RULE_2 AND ( (GROUP_A_RULE_1 OR GROUP_A_RULE_2) "
+"OR (GROUP_B_RULE_1 OR GROUP_B_RULE_2) )"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_th
msgid "Thailand - Accounting"
-msgstr "タイ - 会計"
+msgstr "タイ王国 - 会計"
#. module: base
#: view:res.lang:0
@@ -14811,7 +14886,7 @@ msgstr ""
#. module: base
#: model:res.country,name:base.nc
msgid "New Caledonia (French)"
-msgstr ""
+msgstr "ニューカレドニア（フランス領）"
#. module: base
#: model:ir.module.module,description:base.module_mrp_jit
@@ -14833,60 +14908,75 @@ msgid ""
"\n"
" "
msgstr ""
+"\n"
+"このモジュールはジャストインタイムによる調達オーダーの計算を行います。\n"
+"==================================================================\n"
+"\n"
+"このモジュールをインストールした場合は、定期的な調達スケジューラの実行の必要は\n"
+"ありません（しかし、まだ最小発注点ルールのスケジューラを実行する必要があります。\n"
+"または、例えばそれを毎日実行させます）。\n"
+"全ての調達オーダーは即時実行されます。いくらかのケースでは小さなパフォーマンス\n"
+"の影響が伴うでしょう。\n"
+"\n"
+"製品は可能な限り予約され、そして、スケジューラの時間範囲がもはや考慮されないので、\n"
+"在庫量を増加させることにもなるかも知れません。この場合は、異なった集荷においても、\n"
+"もはや優先度を使うことはできません。\n"
+"\n"
+" "
#. module: base
#: model:res.country,name:base.cy
msgid "Cyprus"
-msgstr ""
+msgstr "キプロス"
#. module: base
#: field:ir.actions.server,subject:0
#: field:partner.massmail.wizard,subject:0
#: field:res.request,name:0
msgid "Subject"
-msgstr ""
+msgstr "件名"
#. module: base
#: selection:res.currency,position:0
msgid "Before Amount"
-msgstr ""
+msgstr "金額の前"
#. module: base
#: field:res.request,act_from:0
#: field:res.request.history,act_from:0
msgid "From"
-msgstr ""
+msgstr "差出人"
#. module: base
#: view:res.users:0
msgid "Preferences"
-msgstr ""
+msgstr "設定"
#. module: base
#: model:res.partner.category,name:base.res_partner_category_consumers0
msgid "Consumers"
-msgstr ""
+msgstr "消費者"
#. module: base
#: view:res.company:0
msgid "Set Bank Accounts"
-msgstr ""
+msgstr "銀行口座のセット"
#. module: base
#: field:ir.actions.client,tag:0
msgid "Client action tag"
-msgstr ""
+msgstr "クライアントアクションタグ"
#. module: base
#: code:addons/base/res/res_lang.py:189
#, python-format
msgid "You cannot delete the language which is User's Preferred Language !"
-msgstr ""
+msgstr "ユーザの優先言語となっている言語を削除することはできません。"
#. module: base
#: field:ir.values,model_id:0
msgid "Model (change only)"
-msgstr ""
+msgstr "モデル（変更のみ）"
#. module: base
#: model:ir.module.module,description:base.module_marketing_campaign_crm_demo
@@ -14899,12 +14989,18 @@ msgid ""
"marketing_campaign.\n"
" "
msgstr ""
+"\n"
+"マーケティングのためのデモデータ\n"
+"============================================\n"
+"\n"
+"marketing_campaignモジュールのために、リード、キャンペーン、セグメントといったデモデータを作成します。\n"
+" "
#. module: base
#: selection:ir.actions.act_window.view,view_mode:0
#: selection:ir.ui.view,type:0
msgid "Kanban"
-msgstr ""
+msgstr "かんばん"
#. module: base
#: code:addons/base/ir/ir_model.py:251
@@ -14912,70 +15008,70 @@ msgstr ""
msgid ""
"The Selection Options expression is must be in the [('key','Label'), ...] "
"format!"
-msgstr ""
+msgstr "選択オプションの式は[('key','Label'), ...] の形式である必要があります。"
#. module: base
#: view:ir.filters:0
msgid "Current User"
-msgstr ""
+msgstr "現在のユーザ"
#. module: base
#: field:res.company,company_registry:0
msgid "Company Registry"
-msgstr ""
+msgstr "会社のレジストリ"
#. module: base
#: view:ir.actions.report.xml:0
msgid "Miscellaneous"
-msgstr ""
+msgstr "その他"
#. module: base
#: model:ir.actions.act_window,name:base.action_ir_mail_server_list
#: view:ir.mail_server:0
#: model:ir.ui.menu,name:base.menu_mail_servers
msgid "Outgoing Mail Servers"
-msgstr ""
+msgstr "送信メールサーバ"
#. module: base
#: model:res.country,name:base.cn
msgid "China"
-msgstr ""
+msgstr "中国"
#. module: base
#: help:ir.actions.server,wkf_model_id:0
msgid ""
"The object that should receive the workflow signal (must have an associated "
"workflow)"
-msgstr ""
+msgstr "ワークフローのシグナルを受け取るべきオブジェクト（関連するワークフローを持たねばなりません）"
#. module: base
#: model:ir.module.category,description:base.module_category_account_voucher
msgid ""
"Allows you to create your invoices and track the payments. It is an easier "
"version of the accounting module for managers who are not accountants."
-msgstr ""
+msgstr "請求書の作成と支払いの追跡ができます。これは、会計士ではないマネジャのための会計モジュールの簡易バージョンです。"
#. module: base
#: model:res.country,name:base.eh
msgid "Western Sahara"
-msgstr ""
+msgstr "西サハラ"
#. module: base
#: model:ir.module.category,name:base.module_category_account_voucher
msgid "Invoicing & Payments"
-msgstr ""
+msgstr "請求と支払"
#. module: base
#: model:ir.actions.act_window,help:base.action_res_company_form
msgid ""
"Create and manage the companies that will be managed by OpenERP from here. "
"Shops or subsidiaries can be created and maintained from here."
-msgstr ""
+msgstr "ここから、OpenERPにより管理される会社の作成と管理をして下さい。店や子会社はここから作成され、維持管理されます。"
#. module: base
#: model:res.country,name:base.id
msgid "Indonesia"
-msgstr ""
+msgstr "インドネシア"
#. module: base
#: view:base.update.translations:0
@@ -14984,6 +15080,8 @@ msgid ""
"you can then add translations manually or perform a complete export (as a "
"template for a new language example)."
msgstr ""
+"このウィザードはアプリケーションに翻訳するための新しい用語を検出します。それを実行し、その後手作業で翻訳を加えるか、完全なエクスポート（新しい言語の例のた"
+"めにテンプレートとして）が実行できます。"
#. module: base
#: model:ir.module.module,description:base.module_l10n_ch
@@ -15031,6 +15129,48 @@ msgid ""
"\n"
"\n"
msgstr ""
+"\n"
+"スイスのローカル化：\n"
+"・ 多数の支払いタイプのためにDTAの作成\n"
+"・ BVR管理（番号生成、レポート他）\n"
+"・ 銀行ファイルからインポート口座の移動（v11 他）\n"
+"・ 調和のために銀行明細書を扱う方法の簡素化\n"
+"\n"
+"次のZIPと銀行の不足項目の追加ができます：\n"
+"・ l10n_ch_zip\n"
+"・ l10n_ch_bank\n"
+" \n"
+"著者：Camptocamp SA\n"
+"寄贈者：Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+"------------------------------------------------------------------------\n"
+"\n"
+"Module incluant la localisation Suisse de TinyERP revu et corrigé par "
+"Camptocamp. Cette nouvelle version\n"
+"comprend la gestion et l'émissionde BVR, le paiement électronique via DTA "
+"(pour les banques, le système postal est en développement)\n"
+"et l'import du relevé de compte depuis la banque de manière automatisée.\n"
+"De plus, nous avons intégré la définition de toutes les banques "
+"Suisses(adresse, swift et clearing).\n"
+"\n"
+"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
+"\n"
+"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
+" - l10n_ch_zip\n"
+" - l10n_ch_bank\n"
+" \n"
+" Auteur: Camptocamp SA\n"
+" Donateurs: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+"--------------------------------------------------------------------------\n"
+"ToDo：\n"
+"・ BVRの部分インポートと調和の実装\n"
+"・ 可能ならosv_memory によるウィザードの置換\n"
+"・ 不足しているヘルプの追加\n"
+"・ コードのコメントの終了\n"
+"・ デモデータの改良\n"
+"\n"
+"\n"
#. module: base
#: help:multi_company.default,expression:0
@@ -15038,26 +15178,28 @@ msgid ""
"Expression, must be True to match\n"
"use context.get or user (browse)"
msgstr ""
+"式は一致する場合はTrueでなければなりません。\n"
+"context.getまたはユーザ（ブラウズ）を使って下さい。"
#. module: base
#: model:res.country,name:base.bg
msgid "Bulgaria"
-msgstr ""
+msgstr "ブルガリア"
#. module: base
#: view:publisher_warranty.contract.wizard:0
msgid "Publisher warranty contract successfully registered!"
-msgstr ""
+msgstr "出版社保証契約は正常に登録されました。"
#. module: base
#: model:res.country,name:base.ao
msgid "Angola"
-msgstr ""
+msgstr "アンゴラ"
#. module: base
#: model:res.country,name:base.tf
msgid "French Southern Territories"
-msgstr ""
+msgstr "フランス領極南諸島"
#. module: base
#: model:ir.model,name:base.model_res_currency
@@ -15067,7 +15209,7 @@ msgstr ""
#: field:res.currency,name:0
#: field:res.currency.rate,currency_id:0
msgid "Currency"
-msgstr ""
+msgstr "通貨"
#. module: base
#: view:res.lang:0
@@ -15077,28 +15219,28 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_ltd
msgid "ltd"
-msgstr ""
+msgstr "株式会社"
#. module: base
#: field:res.log,res_id:0
msgid "Object ID"
-msgstr ""
+msgstr "オブジェクトID"
#. module: base
#: view:res.company:0
msgid "Landscape"
-msgstr ""
+msgstr "横向き"
#. module: base
#: model:ir.actions.todo.category,name:base.category_administration_config
#: model:ir.module.category,name:base.module_category_administration
msgid "Administration"
-msgstr ""
+msgstr "アドミニストレーション"
#. module: base
#: view:base.module.update:0
msgid "Click on Update below to start the process..."
-msgstr ""
+msgstr "プロセスを開始するために以下にある更新をクリックして下さい。"
#. module: base
#: model:res.country,name:base.ir
@@ -15109,35 +15251,35 @@ msgstr "イラン"
#: model:ir.actions.act_window,name:base.res_widget_user_act_window
#: model:ir.ui.menu,name:base.menu_res_widget_user_act_window
msgid "Widgets per User"
-msgstr ""
+msgstr "ユーザ当りのウィジット"
#. module: base
#: model:ir.actions.act_window,name:base.action_publisher_warranty_contract_form
#: model:ir.ui.menu,name:base.menu_publisher_warranty_contract
msgid "Contracts"
-msgstr ""
+msgstr "契約"
#. module: base
#: field:base.language.export,state:0
#: field:ir.ui.menu,icon_pict:0
#: field:publisher_warranty.contract.wizard,state:0
msgid "unknown"
-msgstr ""
+msgstr "不明"
#. module: base
#: field:res.currency,symbol:0
msgid "Symbol"
-msgstr ""
+msgstr "シンボル"
#. module: base
#: help:res.users,login:0
msgid "Used to log into the system"
-msgstr ""
+msgstr "システムにログインするために使用します。"
#. module: base
#: view:base.update.translations:0
msgid "Synchronize Translation"
-msgstr ""
+msgstr "翻訳の同期"
#. module: base
#: model:ir.module.module,description:base.module_base_module_quality
@@ -15159,27 +15301,41 @@ msgid ""
"using it, otherwise it may crash.\n"
" "
msgstr ""
+"\n"
+"このモジュールの目的は、他のモジュール品質をチェックすることです。\n"
+"================================================================\n"
+"\n"
+"これはOpenERPの中のモジュールのリストにあるウィザードを定義します。\n"
+"これによってあなたはOpenERPコーディング基準への準拠、速度効率などの異なった基準に\n"
+"よる評価を行うことができます。\n"
+"\n"
+"このモジュールはあなた自身の品質テストを定義する一般的なフレームワークも提供します。\n"
+"より詳細な情報は、base_module_quality\\README.txt を参照して下さい。\n"
+"\n"
+"警告：このモジュールはZIPファイルに対しては動作しません。使用する前に解凍して下さい。\n"
+" そうでない場合はクラッシュするでしょう。\n"
+" "
#. module: base
#: field:res.partner.bank,bank_name:0
msgid "Bank Name"
-msgstr ""
+msgstr "銀行名"
#. module: base
#: model:res.country,name:base.ki
msgid "Kiribati"
-msgstr ""
+msgstr "キリバス"
#. module: base
#: model:res.country,name:base.iq
msgid "Iraq"
-msgstr ""
+msgstr "イラク"
#. module: base
#: model:ir.module.category,name:base.module_category_association
#: model:ir.ui.menu,name:base.menu_association
msgid "Association"
-msgstr ""
+msgstr "関連"
#. module: base
#: model:ir.module.module,description:base.module_stock_no_autopicking
@@ -15196,11 +15352,20 @@ msgid ""
"supplier in the routing of the assembly operation.\n"
" "
msgstr ""
+"\n"
+"このモジュールは製造オーダーのために原料の提供のための中間の集荷プロセスを行います。\n"
+"============================================================================="
+"====================\n"
+"\n"
+"このモジュールの用途の１例は、仕入先（下請け）によってなされた製造の管理です。\n"
+"この達成のために、下請けで組み立てられた製品は\"自動集荷なし\"にセットし、そして、\n"
+"組み立て実行の経路の中に仕入先の場所を置きます。\n"
+" "
#. module: base
#: view:ir.actions.server:0
msgid "Action to Launch"
-msgstr ""
+msgstr "起動するアクション"
#. module: base
#: help:res.users,context_lang:0
@@ -15209,6 +15374,8 @@ msgid ""
"are available. To add a new language, you can use the 'Load an Official "
"Translation' wizard available from the 'Administration' menu."
msgstr ""
+"翻訳が利用可能である場合、デフォルトの言語はグラフィックユーザインタフェースで利用されます。新しい言語を加えるためには、アドミニストレーションメニューから"
+"利用できる、公式翻訳のロードのウィザードを使うことができます。"
#. module: base
#: model:ir.module.module,description:base.module_l10n_es
@@ -15227,6 +15394,18 @@ msgid ""
"Note: You should install the l10n_ES_account_balance_report module\n"
"for yearly account reporting (balance, profit & losses).\n"
msgstr ""
+"\n"
+"スペインの勘定科目表（PGCE 2008）\n"
+"=======================================\n"
+"\n"
+"・ テンプレートは次の勘定科目表を定義します：\n"
+" ・ スペインの一般的な勘定科目表2008\n"
+" ・ 中小企業向けスペインの一般的な勘定科目表2008\n"
+"・ 売買のためのVATテンプレートを定義します。\n"
+"・ 精勤コードテンプレートを定義します。\n"
+"\n"
+"注記：年次アカウントレポーティング（残高、利益＆損失）のために\n"
+" l10n_ES_account_balance_report モジュールをインストールする必要があります。\n"
#. module: base
#: model:ir.model,name:base.model_ir_sequence_type
@@ -15236,34 +15415,34 @@ msgstr ""
#. module: base
#: selection:base.language.export,format:0
msgid "CSV File"
-msgstr ""
+msgstr "CSVファイル"
#. module: base
#: code:addons/base/res/res_company.py:154
#, python-format
msgid "Phone: "
-msgstr ""
+msgstr "電話： "
#. module: base
#: field:res.company,account_no:0
msgid "Account No."
-msgstr ""
+msgstr "アカウント番号"
#. module: base
#: code:addons/base/res/res_lang.py:187
#, python-format
msgid "Base Language 'en_US' can not be deleted !"
-msgstr ""
+msgstr "基本言語である\"en_US\"は削除できません。"
#. module: base
#: selection:ir.model,state:0
msgid "Base Object"
-msgstr ""
+msgstr "基本オブジェクト"
#. module: base
#: report:ir.module.reference.graph:0
msgid "Dependencies :"
-msgstr ""
+msgstr "依存関係："
#. module: base
#: model:ir.module.module,description:base.module_purchase_analytic_plans
@@ -15288,34 +15467,34 @@ msgstr ""
#. module: base
#: field:res.company,vat:0
msgid "Tax ID"
-msgstr ""
+msgstr "税金ID"
#. module: base
#: field:ir.model.fields,field_description:0
msgid "Field Label"
-msgstr ""
+msgstr "項目ラベル"
#. module: base
#: help:ir.actions.report.xml,report_rml:0
msgid ""
"The path to the main report file (depending on Report Type) or NULL if the "
"content is in another data field"
-msgstr ""
+msgstr "コンテンツが別のデータ項目にある場合、メインレポートファイル（レポートタイプに応じた）へのパスまたはNULL"
#. module: base
#: model:res.country,name:base.dj
msgid "Djibouti"
-msgstr ""
+msgstr "ジブチ"
#. module: base
#: field:ir.translation,value:0
msgid "Translation Value"
-msgstr ""
+msgstr "変換値"
#. module: base
#: model:res.country,name:base.ag
msgid "Antigua and Barbuda"
-msgstr ""
+msgstr "アンティグア・バーブーダ"
#. module: base
#: code:addons/orm.py:3669
@@ -15323,35 +15502,35 @@ msgstr ""
msgid ""
"Operation prohibited by access rules, or performed on an already deleted "
"document (Operation: %s, Document type: %s)."
-msgstr ""
+msgstr "アクセスルールにより操作は禁止されています。または、既にドキュメントは削除されています。（操作：%s、ドキュメントタイプ：%s）"
#. module: base
#: model:res.country,name:base.zr
msgid "Zaire"
-msgstr ""
+msgstr "ザイール"
#. module: base
#: field:ir.translation,res_id:0
#: field:workflow.instance,res_id:0
#: field:workflow.triggers,res_id:0
msgid "Resource ID"
-msgstr ""
+msgstr "リソースID"
#. module: base
#: view:ir.cron:0
#: field:ir.model,info:0
msgid "Information"
-msgstr ""
+msgstr "情報"
#. module: base
#: view:res.widget.user:0
msgid "User Widgets"
-msgstr ""
+msgstr "ユーザウィジット"
#. module: base
#: view:base.module.update:0
msgid "Update Module List"
-msgstr ""
+msgstr "モジュールリストの更新"
#. module: base
#: code:addons/base/res/res_users.py:755
@@ -15360,12 +15539,12 @@ msgstr ""
#: view:res.users:0
#, python-format
msgid "Other"
-msgstr ""
+msgstr "その他"
#. module: base
#: view:res.request:0
msgid "Reply"
-msgstr ""
+msgstr "返信"
#. module: base
#: selection:base.language.install,lang:0
@@ -15396,6 +15575,23 @@ msgid ""
"state are scheduled with taking the phase's start date\n"
" "
msgstr ""
+"\n"
+"長期プロジェクト管理モジュールは計画、スケジューリング、リソース割当を追跡します。\n"
+"============================================================================="
+"==============\n"
+"\n"
+"特徴\n"
+"--------\n"
+" ・ 大きなプロジェクトの管理\n"
+" ・ プロジェクトの様々なフェーズを定義\n"
+" ・ "
+"フェーズスケジューリングの計算：与えられたプロジェクトの状態がドラフト、オープン、ペンディングであるフェーズの開始日、終了日を計算する。もし、どのプロジェ"
+"クトも与えられない場合は、全てのドラフト、オープン、ペンディング状態のフェーズが計算されます。\n"
+" ・ タスクスケジューリングの計算：これは project.phase "
+"上のスケジューラボタンと同じように機能します。それは引数としてそのプロジェクトを取り、そして全てのオープン、ドラフト、ペンディングのタスクを計算します。"
+"\n"
+" ・ タスクのスケジュール：ドラフト、ペンディング、オープン状態の全てのタスクはフェーズの開始日を取りスケジュールされます。\n"
+" "
#. module: base
#: model:ir.actions.act_window,name:base.action_workflow_activity_form
@@ -15403,28 +15599,28 @@ msgstr ""
#: view:workflow:0
#: field:workflow,activities:0
msgid "Activities"
-msgstr ""
+msgstr "アクティビティ"
#. module: base
#: model:ir.module.module,shortdesc:base.module_product
msgid "Products & Pricelists"
-msgstr ""
+msgstr "製品と価格表"
#. module: base
#: field:ir.actions.act_window,auto_refresh:0
msgid "Auto-Refresh"
-msgstr ""
+msgstr "自動リフレッシュ"
#. module: base
#: code:addons/base/ir/ir_model.py:74
#, python-format
msgid "The osv_memory field can only be compared with = and != operator."
-msgstr ""
+msgstr "osv_memory項目は、= と != 演算子とのみ比較することができます。"
#. module: base
#: selection:ir.ui.view,type:0
msgid "Diagram"
-msgstr ""
+msgstr "ダイアグラム"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_es
@@ -15439,44 +15635,44 @@ msgstr "製造前の集荷"
#. module: base
#: model:res.country,name:base.wf
msgid "Wallis and Futuna Islands"
-msgstr ""
+msgstr "ワリス・フテュナ諸島"
#. module: base
#: help:multi_company.default,name:0
msgid "Name it to easily find a record"
-msgstr ""
+msgstr "レコードを簡単に見つけるために名前をつけて下さい。"
#. module: base
#: model:res.country,name:base.gr
msgid "Greece"
-msgstr ""
+msgstr "ギリシャ"
#. module: base
#: model:ir.module.module,shortdesc:base.module_web_calendar
msgid "web calendar"
-msgstr ""
+msgstr "Webカレンダー"
#. module: base
#: field:ir.model.data,name:0
msgid "External Identifier"
-msgstr ""
+msgstr "外部識別子"
#. module: base
#: model:ir.actions.act_window,name:base.grant_menu_access
#: model:ir.ui.menu,name:base.menu_grant_menu_access
msgid "Menu Items"
-msgstr ""
+msgstr "メニュー項目"
#. module: base
#: constraint:ir.rule:0
msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
+msgstr "osv_memoryオブジェクトに対するルールはサポートされていません。"
#. module: base
#: model:ir.module.module,shortdesc:base.module_event
#: model:ir.ui.menu,name:base.menu_event_main
msgid "Events Organisation"
-msgstr ""
+msgstr "イベント機構"
#. module: base
#: model:ir.actions.act_window,name:base.ir_sequence_actions
@@ -15485,12 +15681,12 @@ msgstr ""
#: model:ir.ui.menu,name:base.next_id_6
#: view:workflow.activity:0
msgid "Actions"
-msgstr ""
+msgstr "アクション"
#. module: base
#: model:ir.module.module,shortdesc:base.module_delivery
msgid "Delivery Costs"
-msgstr ""
+msgstr "配達コスト"
#. module: base
#: code:addons/base/ir/ir_cron.py:293
@@ -15498,7 +15694,7 @@ msgstr ""
msgid ""
"This cron task is currently being executed and may not be modified, please "
"try again in a few minutes"
-msgstr ""
+msgstr "このcronタスクは現在実行されていますが、変更されないかもしれません。数分後に再度試して下さい。"
#. module: base
#: model:ir.module.module,description:base.module_product_expiry
@@ -15515,11 +15711,22 @@ msgid ""
"\n"
"Used, for example, in food industries."
msgstr ""
+"\n"
+"製品における製造ロットの異なる日付を追跡します。\n"
+"======================================================\n"
+"\n"
+"次の日付の追跡ができます：\n"
+" ・ 製造終了\n"
+" ・ 最高であった日付\n"
+" ・ 撤去日\n"
+" ・ 警告日付\n"
+"\n"
+"利用例：食品産業"
#. module: base
#: field:ir.exports.line,export_id:0
msgid "Export"
-msgstr ""
+msgstr "エクスポート"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_nl
@@ -15530,12 +15737,12 @@ msgstr "オランダ - 会計"
#: field:res.bank,bic:0
#: field:res.partner.bank,bank_bic:0
msgid "Bank Identifier Code"
-msgstr ""
+msgstr "銀行識別コード"
#. module: base
#: model:res.country,name:base.tm
msgid "Turkmenistan"
-msgstr ""
+msgstr "トルクメニスタン"
#. module: base
#: model:ir.module.module,description:base.module_web_process
@@ -15544,6 +15751,9 @@ msgid ""
" OpenERP Web process view.\n"
" "
msgstr ""
+"\n"
+" OpenERP Webプロセスビュー\n"
+" "
#. module: base
#: model:ir.module.module,description:base.module_account_chart
@@ -15554,6 +15764,11 @@ msgid ""
"\n"
"Deactivates minimal chart of accounts.\n"
msgstr ""
+"\n"
+"最小限の会計表の削除\n"
+"=============================\n"
+"\n"
+"最小限の勘定科目表を無効にします。\n"
#. module: base
#: code:addons/base/ir/ir_actions.py:653
@@ -15586,22 +15801,22 @@ msgstr ""
#: code:addons/orm.py:3704
#, python-format
msgid "Error"
-msgstr ""
+msgstr "エラー"
#. module: base
#: model:ir.module.module,shortdesc:base.module_base_crypt
msgid "DB Password Encryption"
-msgstr ""
+msgstr "DBパスワードの暗号化"
#. module: base
#: help:workflow.transition,act_to:0
msgid "The destination activity."
-msgstr ""
+msgstr "行き先のアクティビティ"
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_check_writing
msgid "Check writing"
-msgstr ""
+msgstr "書き込みチェック"
#. module: base
#: model:ir.module.module,description:base.module_sale_layout
@@ -15617,28 +15832,38 @@ msgid ""
"\n"
" "
msgstr ""
+"\n"
+"このモジュールは受注オーダーのレイアウトを改良する機能を提供します。\n"
+"=======================================================================\n"
+"\n"
+"次の変更が可能です。\n"
+" ・ 受注オーダーのオーダー全行\n"
+" ・ タイトル、コメント行、小計行の追加\n"
+" ・ 水平線の描画、改ページの追加\n"
+"\n"
+" "
#. module: base
#: view:base.module.update:0
#: view:base.module.upgrade:0
#: view:base.update.translations:0
msgid "Update"
-msgstr ""
+msgstr "更新"
#. module: base
#: model:ir.actions.report.xml,name:base.ir_module_reference_print
msgid "Technical guide"
-msgstr ""
+msgstr "テクニカルガイド"
#. module: base
#: view:res.company:0
msgid "Address Information"
-msgstr ""
+msgstr "アドレス情報"
#. module: base
#: model:res.country,name:base.tz
msgid "Tanzania"
-msgstr ""
+msgstr "タンザニア"
#. module: base
#: selection:base.language.install,lang:0
@@ -15648,27 +15873,27 @@ msgstr "デンマーク語 / Dansk"
#. module: base
#: selection:ir.model.fields,select_level:0
msgid "Advanced Search (deprecated)"
-msgstr ""
+msgstr "高度な検索（非推奨）"
#. module: base
#: model:res.country,name:base.cx
msgid "Christmas Island"
-msgstr ""
+msgstr "クリスマス島"
#. module: base
#: model:ir.module.module,shortdesc:base.module_web_livechat
msgid "Live Chat Support"
-msgstr ""
+msgstr "ライブチャットのサポート"
#. module: base
#: view:ir.actions.server:0
msgid "Other Actions Configuration"
-msgstr ""
+msgstr "その他のアクションの設定"
#. module: base
#: selection:ir.module.module.dependency,state:0
msgid "Uninstallable"
-msgstr ""
+msgstr "アンインストール可能"
#. module: base
#: model:ir.module.module,description:base.module_web_dashboard
@@ -15677,6 +15902,9 @@ msgid ""
" OpenERP Web dashboard view.\n"
" "
msgstr ""
+"\n"
+" OpenERP Webダッシュボードビュー\n"
+" "
#. module: base
#: view:res.partner:0
@@ -15686,12 +15914,12 @@ msgstr "仕入先パートナ"
#. module: base
#: view:res.config.installer:0
msgid "Install Modules"
-msgstr ""
+msgstr "モジュールのインストール"
#. module: base
#: view:ir.ui.view:0
msgid "Extra Info"
-msgstr ""
+msgstr "追加情報"
#. module: base
#: model:ir.module.module,description:base.module_l10n_be_hr_payroll
@@ -15711,21 +15939,35 @@ msgid ""
" * Salary Maj, ONSS, Withholding Tax, Child Allowance, ...\n"
" "
msgstr ""
+"\n"
+"ベルギーの給与規則\n"
+"=====================\n"
+"\n"
+" ・ 従業員の詳細\n"
+" ・ 従業員の契約\n"
+" ・ パスポートベースの契約\n"
+" ・ 手当 / 控除\n"
+" ・ 基本 / 成長 / ネット給与の設定を許可\n"
+" ・ 従業員の給与明細\n"
+" ・ 月次給与登録\n"
+" ・ 休日の管理と統合\n"
+" ・ 主要な給与、ONSS、源泉徴収税、児童手当など\n"
+" "
#. module: base
#: model:ir.model,name:base.model_partner_wizard_ean_check
msgid "Ean Check"
-msgstr ""
+msgstr "EANチェック"
#. module: base
#: view:res.partner:0
msgid "Customer Partners"
-msgstr ""
+msgstr "顧客パートナ"
#. module: base
#: sql_constraint:res.users:0
msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "同一のログインに２つのユーザを持つことはできません！"
#. module: base
#: model:ir.model,name:base.model_res_request_history
@@ -15735,12 +15977,12 @@ msgstr ""
#. module: base
#: model:ir.model,name:base.model_multi_company_default
msgid "Default multi company"
-msgstr ""
+msgstr "複数会社のデフォルト"
#. module: base
#: view:res.request:0
msgid "Send"
-msgstr ""
+msgstr "送信"
#. module: base
#: model:ir.module.module,description:base.module_process
@@ -15756,31 +15998,40 @@ msgid ""
"\n"
" "
msgstr ""
+"\n"
+"このモジュールは選択したモジュールでそれらが起こる順序に関係する基本的なプロセスを示します。\n"
+"============================================================================="
+"=========================\n"
+"\n"
+"注記：これは modulename_process_xml を含むモジュールに適用されます。\n"
+"例えば、product/process/product_process_xml\n"
+"\n"
+" "
#. module: base
#: field:res.users,menu_tips:0
msgid "Menu Tips"
-msgstr ""
+msgstr "メニューヒント"
#. module: base
#: field:ir.translation,src:0
msgid "Source"
-msgstr ""
+msgstr "ソース"
#. module: base
#: help:res.partner.address,partner_id:0
msgid "Keep empty for a private address, not related to partner."
-msgstr ""
+msgstr "プライベートアドレス、パートナと関係しない場合は空のままにしておいて下さい。"
#. module: base
#: model:res.country,name:base.vu
msgid "Vanuatu"
-msgstr ""
+msgstr "バヌアツ"
#. module: base
#: view:res.company:0
msgid "Internal Header/Footer"
-msgstr ""
+msgstr "内部ヘッダー / フッター"
#. module: base
#: model:ir.module.module,shortdesc:base.module_crm
@@ -15794,21 +16045,23 @@ msgid ""
"Save this document to a .tgz file. This archive containt UTF-8 %s files and "
"may be uploaded to launchpad."
msgstr ""
+"このドキュメントを .tgz ファイルとして保存して下さい。このアーカイブには UTF-8 の %s "
+"ファイルが含まれており、launchpadにアップロードできます。"
#. module: base
#: view:base.module.upgrade:0
msgid "Start configuration"
-msgstr ""
+msgstr "設定を開始"
#. module: base
#: view:base.language.export:0
msgid "_Export"
-msgstr ""
+msgstr "エクスポート"
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_followup
msgid "Followup Management"
-msgstr ""
+msgstr "フォローの管理"
#. module: base
#: model:ir.module.module,description:base.module_l10n_fr
@@ -15819,6 +16072,11 @@ msgid ""
"\n"
"Credits: Sistheo Zeekom CrysaLEAD\n"
msgstr ""
+"\n"
+"このモジュールはOpenERPのフランス会計表を管理するためのモジュールです。\n"
+"========================================================================\n"
+"\n"
+"Credits: Sistheo Zeekom CrysaLEAD\n"
#. module: base
#: selection:base.language.install,lang:0
@@ -15833,7 +16091,7 @@ msgstr "ギリシャ語 / Ελληνικά"
#. module: base
#: model:res.country,name:base.do
msgid "Dominican Republic"
-msgstr ""
+msgstr "ドミニカ共和国"
#. module: base
#: selection:base.language.install,lang:0
@@ -15847,6 +16105,8 @@ msgid ""
"Invalid group_by specification: \"%s\".\n"
"A group_by specification must be a list of valid fields."
msgstr ""
+"無効な group_by 仕様です：%s\n"
+"group_by 仕様は有効な項目のリストでなければなりません。"
#. module: base
#: selection:ir.mail_server,smtp_encryption:0
@@ -15856,22 +16116,22 @@ msgstr ""
#. module: base
#: help:ir.actions.act_window,usage:0
msgid "Used to filter menu and home actions from the user form."
-msgstr ""
+msgstr "ユーザフォームからメニューやホームアクションをフィルタするために使われます。"
#. module: base
#: model:res.country,name:base.sa
msgid "Saudi Arabia"
-msgstr ""
+msgstr "サウジアラビア"
#. module: base
#: help:res.company,rml_header1:0
msgid "Appears by default on the top right corner of your printed documents."
-msgstr ""
+msgstr "印刷したドキュメントの右側の上部にデフォルトで表示されます。"
#. module: base
#: model:ir.module.module,shortdesc:base.module_fetchmail_crm_claim
msgid "eMail Gateway for CRM Claim"
-msgstr ""
+msgstr "CRMクレームのためのEメールゲートウェイ"
#. module: base
#: help:res.partner,supplier:0
@@ -15886,34 +16146,34 @@ msgstr ""
#: field:ir.actions.server,trigger_obj_id:0
#: field:ir.model.fields,relation_field:0
msgid "Relation Field"
-msgstr ""
+msgstr "関係項目"
#. module: base
#: view:res.partner.event:0
msgid "Event Logs"
-msgstr ""
+msgstr "イベントログ"
#. module: base
#: code:addons/base/module/wizard/base_module_configuration.py:38
#, python-format
msgid "System Configuration done"
-msgstr ""
+msgstr "システム設定が完了しました。"
#. module: base
#: view:ir.actions.server:0
msgid "Create / Write / Copy"
-msgstr ""
+msgstr "作成 / 書き込み / コピー"
#. module: base
#: field:workflow.triggers,instance_id:0
msgid "Destination Instance"
-msgstr ""
+msgstr "行き先のインスタンス"
#. module: base
#: field:ir.actions.act_window,multi:0
#: field:ir.actions.wizard,multi:0
msgid "Action on Multiple Doc."
-msgstr ""
+msgstr "複数ドキュメントのアクション"
#. module: base
#: view:base.language.export:0
@@ -15923,12 +16183,12 @@ msgstr ""
#. module: base
#: view:base.language.export:0
msgid "Export Translations"
-msgstr ""
+msgstr "翻訳のエクスポート"
#. module: base
#: field:ir.actions.report.xml,report_xml:0
msgid "XML path"
-msgstr ""
+msgstr "XMLパス"
#. module: base
#: help:ir.sequence,implementation:0
@@ -15937,16 +16197,18 @@ msgid ""
"later is slower than the former but forbids any gap in the sequence (while "
"they are possible in the former)."
msgstr ""
+"２つのシーケンスオブジェクトの実装が提供されます：標準と\"ギャップなし\"です。後者は前者よりも遅いですが、どんな順序のギャップを禁じます（前者は可能で"
+"す）。"
#. module: base
#: model:res.country,name:base.gn
msgid "Guinea"
-msgstr ""
+msgstr "ギニア"
#. module: base
#: model:res.country,name:base.lu
msgid "Luxembourg"
-msgstr ""
+msgstr "ルクセンブルク"
#. module: base
#: selection:res.request,priority:0
@@ -16547,7 +16809,7 @@ msgstr ""
#: code:addons/base/res/res_partner.py:273
#, python-format
msgid "Warning"
-msgstr ""
+msgstr "警告"
#. module: base
#: model:ir.module.module,shortdesc:base.module_edi
@@ -17080,7 +17342,7 @@ msgstr ""
#: code:addons/base/res/res_users.py:270
#, python-format
msgid "Company Switch Warning"
-msgstr ""
+msgstr "会社切替の警告"
#. module: base
#: model:res.country,name:base.ge
diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 877de335dcc..ccec381f1d1 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -219,7 +219,7 @@
{'active_test': False}
-
+
@@ -683,7 +683,7 @@
tree,form
-
+
-
+
@@ -1950,7 +1950,7 @@
form
The configuration wizards are used to help you configure a new instance of OpenERP. They are launched during the installation of new modules, but you can choose to restart some wizards manually from this menu.
-
-
-
+
+
diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py
index 1af5818438a..739c5679798 100644
--- a/openerp/addons/base/ir/ir_model.py
+++ b/openerp/addons/base/ir/ir_model.py
@@ -717,8 +717,8 @@ class ir_model_data(osv.osv):
model_obj = self.pool.get(model)
if not context:
context = {}
- # records created during module install should result in res.log entries that are already read!
- context = dict(context, res_log_read=True)
+ # records created during module install should not display the messages of OpenChatter
+ context = dict(context, install_mode=True)
if xml_id and ('.' in xml_id):
assert len(xml_id.split('.'))==2, _("'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id") % (xml_id)
module, xml_id = xml_id.split('.')
diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py
index f992e06b37f..1f3f2e0f181 100644
--- a/openerp/addons/base/ir/ir_ui_menu.py
+++ b/openerp/addons/base/ir/ir_ui_menu.py
@@ -263,11 +263,14 @@ class ir_ui_menu(osv.osv):
res[menu.id] = {}
if menu.action and menu.action.type == 'ir.actions.act_window' and menu.action.res_model:
menu_needaction_res = self.pool.get(menu.action.res_model).get_needaction_info(cr, uid, uid, domain=menu.action.domain, context=context)
+ # TODO: find the addon that causes a bug on runbot, not on local
+ if not isinstance(menu_needaction_res[1], (int, long)): menu_needaction_res[1] = 0
else:
menu_needaction_res = [False, 0, ()]
res[menu.id]['needaction_enabled'] = menu_needaction_res[0]
res[menu.id]['needaction_counter'] = menu_needaction_res[1]
- res[menu.id]['needaction_record_ids'] = menu_needaction_res[2]
+ # not used currently, therefore set to a void list
+ res[menu.id]['needaction_record_ids'] = []
return res
_columns = {
diff --git a/openerp/addons/base/ir/ir_values.py b/openerp/addons/base/ir/ir_values.py
index 2a33e0c73c4..7af11789225 100644
--- a/openerp/addons/base/ir/ir_values.py
+++ b/openerp/addons/base/ir/ir_values.py
@@ -251,6 +251,21 @@ class ir_values(osv.osv):
'company_id': company_id,
})
+ def get_default(self, cr, uid, model, field_name, for_all_users=True, company_id=False, condition=False):
+ """ Return the default value defined for model, field_name, users, company and condition.
+ Return ``None`` if no such default exists.
+ """
+ search_criteria = [
+ ('key', '=', 'default'),
+ ('key2', '=', condition and condition[:200]),
+ ('model', '=', model),
+ ('name', '=', field_name),
+ ('user_id', '=', False if for_all_users else uid),
+ ('company_id','=', company_id)
+ ]
+ defaults = self.browse(cr, uid, self.search(cr, uid, search_criteria))
+ return pickle.loads(defaults[0].value.encode('utf-8')) if defaults else None
+
def get_defaults(self, cr, uid, model, condition=False):
"""Returns any default values that are defined for the current model and user,
(and match ``condition``, if specified), previously registered via
diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index acf22923d14..c6342307867 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -69,6 +69,7 @@ class module_category(osv.osv):
'description' : fields.text("Description", translate=True),
'sequence' : fields.integer('Sequence'),
'visible' : fields.boolean('Visible'),
+ 'xml_id': fields.function(osv.osv.get_external_id, type='char', size=128, string="External ID"),
}
_order = 'name'
diff --git a/openerp/addons/base/publisher_warranty/publisher_warranty.py b/openerp/addons/base/publisher_warranty/publisher_warranty.py
index 0669dadb228..2fa47f150f3 100644
--- a/openerp/addons/base/publisher_warranty/publisher_warranty.py
+++ b/openerp/addons/base/publisher_warranty/publisher_warranty.py
@@ -187,21 +187,21 @@ class publisher_warranty_contract(osv.osv):
limit_date = (datetime.datetime.now() - _PREVIOUS_LOG_CHECK).strftime(misc.DEFAULT_SERVER_DATETIME_FORMAT)
- for message in result["messages"]:
- ids = self.pool.get("res.log").search(cr, uid, [("res_model", "=", "publisher_warranty.contract"),
- ("create_date", ">=", limit_date),
- ("name", "=", message)])
- if ids:
- continue
- self.pool.get('res.log').create(cr, uid,
- {
- 'name': message,
- 'res_model': "publisher_warranty.contract",
- "read": True,
- "user_id": False,
- },
- context=context
- )
+
+ # old behavior based on res.log; now on mail.message, that is not necessarily installed
+ mail_message_obj = self.pool.get('mail.message')
+ if mail_message_obj:
+ for message in result["messages"]:
+ ids = mail_message_obj.search(cr, uid, [("model", "=", "publisher_warranty.contract"),
+ ("create_date", ">=", limit_date),
+ ("body_text", "=", message)])
+ if ids:
+ continue
+ mail_message_obj.create(cr, uid, {
+ 'name': message,
+ 'model': "publisher_warranty.contract",
+ 'user_id': False,
+ }, context=context)
except Exception:
if cron_mode:
return False # we don't want to see any stack trace in cron
@@ -215,22 +215,15 @@ class publisher_warranty_contract(osv.osv):
@return: A list of html messages with ids, can be False or empty.
@rtype: list of tuples(int,string)
"""
- ids = self.pool.get('res.log').search(cr, uid, [("res_model", "=", "publisher_warranty.contract")]
- , order="create_date desc", limit=limit)
+ if not self.pool.get('mail.message'):
+ return []
+ ids = self.pool.get('mail.message').search(cr, uid, [("model", "=", "publisher_warranty.contract")]
+ , order="create_date desc", limit=limit, context=context)
if not ids:
return []
- messages = [(x.id, x.name) for x in self.pool.get('res.log').browse(cr, uid, ids)]
-
+ messages = [(x.id, x.name) for x in self.pool.get('mail.message').browse(cr, uid, ids, context=context)]
return messages
- def del_user_message(self, cr, uid, id, context=None):
- """
- Delete a message.
- """
- self.pool.get('res.log').unlink(cr, uid, [id])
-
- return True
-
_columns = {
'name' : fields.char('Serial Key', size=384, required=True, help="Your OpenERP Publisher's Warranty Contract unique key, also called serial number."),
'date_start' : fields.date('Starting Date', readonly=True),
diff --git a/openerp/addons/base/res/__init__.py b/openerp/addons/base/res/__init__.py
index 2b4da739f54..1131564a812 100644
--- a/openerp/addons/base/res/__init__.py
+++ b/openerp/addons/base/res/__init__.py
@@ -32,7 +32,6 @@ import res_company
import res_users
import res_request
import res_lang
-import res_log
import res_widget
import ir_property
diff --git a/openerp/addons/base/res/ir_property_view.xml b/openerp/addons/base/res/ir_property_view.xml
index b793c090491..d0292576199 100644
--- a/openerp/addons/base/res/ir_property_view.xml
+++ b/openerp/addons/base/res/ir_property_view.xml
@@ -75,7 +75,7 @@
form
-
+
diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py
index 2054badb41c..0b348da3d74 100644
--- a/openerp/addons/base/res/res_config.py
+++ b/openerp/addons/base/res/res_config.py
@@ -396,4 +396,162 @@ class ir_actions_configuration_wizard(osv.osv_memory):
ir_actions_configuration_wizard()
+
+
+class res_config_settings(osv.osv_memory):
+ """ Base configuration wizard for application settings. It provides support for setting
+ default values, assigning groups to employee users, and installing modules.
+ To make such a 'settings' wizard, define a model like::
+
+ class my_config_wizard(osv.osv_memory):
+ _name = 'my.settings'
+ _inherit = 'res.config.settings'
+ _columns = {
+ 'default_foo': fields.type(..., default_model='my.model'),
+ 'group_bar': fields.boolean(..., group='base.group_user', implied_group='my.group'),
+ 'module_baz': fields.boolean(...),
+ 'other_field': fields.type(...),
+ }
+
+ The method ``execute`` provides some support based on a naming convention:
+
+ * For a field like 'default_XXX', ``execute`` sets the (global) default value of
+ the field 'XXX' in the model named by ``default_model`` to the field's value.
+
+ * For a boolean field like 'group_XXX', ``execute`` adds/removes 'implied_group'
+ to/from the implied groups of 'group', depending on the field's value.
+ By default 'group' is the group Employee. Groups are given by their xml id.
+
+ * For a boolean field like 'module_XXX', ``execute`` triggers the immediate
+ installation of the module named 'XXX' if the field has value ``True``.
+
+ * For the other fields, the method ``execute`` invokes all methods with a name
+ that starts with 'set_'; such methods can be defined to implement the effect
+ of those fields.
+
+ The method ``default_get`` retrieves values that reflect the current status of the
+ fields like 'default_XXX', 'group_XXX' and 'module_XXX'. It also invokes all methods
+ with a name that starts with 'get_default_'; such methods can be defined to provide
+ current values for other fields.
+ """
+ _name = 'res.config.settings'
+
+ def copy(self, cr, uid, id, values, context=None):
+ raise osv.except_osv(_("Cannot duplicate configuration!"), "")
+
+ def _get_classified_fields(self, cr, uid, context=None):
+ """ return a dictionary with the fields classified by category::
+
+ { 'default': [('default_foo', 'model', 'foo'), ...],
+ 'group': [('group_bar', browse_group, browse_implied_group), ...],
+ 'module': [('module_baz', browse_module), ...],
+ 'other': ['other_field', ...],
+ }
+ """
+ ir_model_data = self.pool.get('ir.model.data')
+ ir_module = self.pool.get('ir.module.module')
+ def ref(xml_id):
+ mod, xml = xml_id.split('.', 1)
+ return ir_model_data.get_object(cr, uid, mod, xml, context)
+
+ defaults, groups, modules, others = [], [], [], []
+ for name, field in self._columns.items():
+ if name.startswith('default_') and hasattr(field, 'default_model'):
+ defaults.append((name, field.default_model, name[8:]))
+ elif name.startswith('group_') and isinstance(field, fields.boolean) and hasattr(field, 'implied_group'):
+ field_group = getattr(field, 'group', 'base.group_user')
+ groups.append((name, ref(field_group), ref(field.implied_group)))
+ elif name.startswith('module_') and isinstance(field, fields.boolean):
+ mod_ids = ir_module.search(cr, uid, [('name', '=', name[7:])])
+ modules.append((name, ir_module.browse(cr, uid, mod_ids[0], context)))
+ else:
+ others.append(name)
+
+ return {'default': defaults, 'group': groups, 'module': modules, 'other': others}
+
+ def default_get(self, cr, uid, fields, context=None):
+ ir_values = self.pool.get('ir.values')
+ classified = self._get_classified_fields(cr, uid, context)
+
+ res = super(res_config_settings, self).default_get(cr, uid, fields, context)
+
+ # defaults: take the corresponding default value they set
+ for name, model, field in classified['default']:
+ value = ir_values.get_default(cr, uid, model, field)
+ if value is not None:
+ res[name] = value
+
+ # groups: which groups are implied by the group Employee
+ for name, group, implied_group in classified['group']:
+ res[name] = implied_group in group.implied_ids
+
+ # modules: which modules are installed/to install
+ for name, module in classified['module']:
+ res[name] = module.state in ('installed', 'to install', 'to upgrade')
+
+ # other fields: call all methods that start with 'get_default_'
+ for method in dir(self):
+ if method.startswith('get_default_'):
+ res.update(getattr(self, method)(cr, uid, fields, context))
+
+ return res
+
+ def fields_get(self, cr, uid, allfields=None, context=None, write_access=True):
+ # overridden to make fields of installed modules readonly
+ res = super(res_config_settings, self).fields_get(cr, uid, allfields, context, write_access)
+ classified = self._get_classified_fields(cr, uid, context)
+ for name, module in classified['module']:
+ if name in res and module.state in ('installed', 'to install', 'to upgrade'):
+ res[name]['readonly'] = True
+ return res
+
+ def execute(self, cr, uid, ids, context=None):
+ ir_values = self.pool.get('ir.values')
+ ir_model_data = self.pool.get('ir.model.data')
+ ir_module = self.pool.get('ir.module.module')
+ res_groups = self.pool.get('res.groups')
+ classified = self._get_classified_fields(cr, uid, context)
+
+ config = self.browse(cr, uid, ids[0], context)
+
+ # default values fields
+ for name, model, field in classified['default']:
+ ir_values.set_default(cr, uid, model, field, config[name])
+
+ # group fields: modify group / implied groups
+ for name, group, implied_group in classified['group']:
+ if config[name]:
+ group.write({'implied_ids': [(4, implied_group.id)]})
+ else:
+ group.write({'implied_ids': [(3, implied_group.id)]})
+ implied_group.write({'users': [(3, u.id) for u in group.users]})
+
+ # other fields: execute all methods that start with 'set_'
+ for method in dir(self):
+ if method.startswith('set_'):
+ getattr(self, method)(cr, uid, ids, context)
+
+ # module fields: install immediately the selected modules
+ to_install_ids = []
+ for name, module in classified['module']:
+ if config[name] and module.state == 'uninstalled':
+ to_install_ids.append(module.id)
+ if to_install_ids:
+ ir_module.button_immediate_install(cr, uid, to_install_ids, context)
+
+ # open the menu for this wizard (or Settings), and force client-side refresh
+ act_ids = self.pool.get('ir.actions.act_window').search(cr, uid, [('res_model', '=', self._name)])
+ act_refs = ['ir.actions.act_window,%s' % id for id in act_ids]
+ val_ids = ir_values.search(cr, uid, [('model', '=', 'ir.ui.menu'), ('key', '=', 'action'),
+ ('key2', '=', 'tree_but_open'), ('value', 'in', act_refs)])
+ if val_ids:
+ menu_id = ir_values.browse(cr, uid, val_ids[0]).res_id
+ else:
+ menu_id = ir_model_data.get_object(cr, uid, 'base', 'menu_administration', context).id
+ return {
+ 'type': 'ir.ui.menu',
+ 'menu_id': menu_id,
+ 'reload': True,
+ }
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/res/res_log.py b/openerp/addons/base/res/res_log.py
deleted file mode 100644
index ef49b52ee52..00000000000
--- a/openerp/addons/base/res/res_log.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2009 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-from osv import fields, osv
-
-class res_log(osv.osv):
- _name = 'res.log'
- _columns = {
- 'name': fields.char('Message', size=250, help='The logging message.', required=True, select=1),
- 'user_id': fields.many2one('res.users','User'),
- 'res_model': fields.char('Object', size=128, select=1),
- 'context': fields.char('Context', size=250),
- 'res_id': fields.integer('Object ID'),
- 'secondary': fields.boolean('Secondary Log', help='Do not display this log if it belongs to the same object the user is working on'),
- 'create_date': fields.datetime('Creation Date', readonly=True, select=1),
- 'read': fields.boolean('Read', help="If this log item has been read, get() should not send it to the client"),
- }
- _defaults = {
- 'user_id': lambda self,cr,uid,ctx: uid,
- 'context': "{}",
- 'read': False,
- }
- _order='create_date desc'
-
- _index_name = 'res_log_uid_read'
- def _auto_init(self, cr, context=None):
- super(res_log, self)._auto_init(cr, context)
- cr.execute('SELECT 1 FROM pg_indexes WHERE indexname=%s',
- (self._index_name,))
- if not cr.fetchone():
- cr.execute('CREATE INDEX %s ON res_log (user_id, read)' %
- self._index_name)
-
- def create(self, cr, uid, vals, context=None):
- create_context = context and dict(context) or {}
- if 'res_log_read' in create_context:
- vals['read'] = create_context.pop('res_log_read')
- if create_context and not vals.get('context'):
- vals['context'] = create_context
- return super(res_log, self).create(cr, uid, vals, context=context)
-
- # TODO: do not return secondary log if same object than in the model (but unlink it)
- def get(self, cr, uid, context=None):
- unread_log_ids = self.search(cr, uid,
- [('user_id','=',uid), ('read', '=', False)], context=context)
- res = self.read(cr, uid, unread_log_ids,
- ['name','res_model','res_id','context'],
- context=context)
- res.reverse()
- result = []
- res_dict = {}
- for r in res:
- t = (r['res_model'], r['res_id'])
- if t not in res_dict:
- res_dict[t] = True
- result.insert(0,r)
- self.write(cr, uid, unread_log_ids, {'read': True}, context=context)
- return result
-
-res_log()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/res/res_log_view.xml b/openerp/addons/base/res/res_log_view.xml
deleted file mode 100644
index e8cb912e227..00000000000
--- a/openerp/addons/base/res/res_log_view.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
- res.log.search
- res.log
- search
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- res.log.tree
- res.log
- tree
-
-
-
-
-
-
-
-
-
- res.log.form
- res.log
- form
-
-
-
-
-
-
- Client Logs
- res.log
- form
- {'search_default_my': 1}
-
-
-
-
diff --git a/openerp/addons/base/res/res_security.xml b/openerp/addons/base/res/res_security.xml
index 6a2bf52d21b..f02abd90985 100644
--- a/openerp/addons/base/res/res_security.xml
+++ b/openerp/addons/base/res/res_security.xml
@@ -2,7 +2,7 @@
-
+
Partner Manager
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 63892ebd869..6ed6e7cc74c 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -40,7 +40,6 @@ from service import security
import tools
from tools.translate import _
-
_logger = logging.getLogger(__name__)
class groups(osv.osv):
@@ -97,22 +96,6 @@ class groups(osv.osv):
self.pool.get('ir.model.access').call_cache_clearing_methods(cr)
return res
- def create(self, cr, uid, vals, context=None):
- if 'name' in vals:
- if vals['name'].startswith('-'):
- raise osv.except_osv(_('Error'),
- _('The name of the group can not start with "-"'))
- gid = super(groups, self).create(cr, uid, vals, context=context)
- if context and context.get('noadmin', False):
- pass
- else:
- # assign this new group to user_root
- user_obj = self.pool.get('res.users')
- aid = user_obj.browse(cr, 1, user_obj._get_admin_id(cr))
- if aid:
- aid.write({'groups_id': [(4, gid)]})
- return gid
-
def get_extended_interface_group(self, cr, uid, context=None):
data_obj = self.pool.get('ir.model.data')
extended_group_data_id = data_obj._get_id(cr, uid, 'base', 'group_extended')
@@ -221,7 +204,7 @@ class users(osv.osv):
img_stream = StringIO.StringIO()
img.save(img_stream, "PNG")
return img_stream.getvalue().encode('base64')
-
+
def _get_avatar(self, cr, uid, ids, name, args, context=None):
result = dict.fromkeys(ids, False)
for user in self.browse(cr, uid, ids, context=context):
@@ -392,7 +375,7 @@ class users(osv.osv):
}
# User can write to a few of her own fields (but not her groups for example)
- SELF_WRITEABLE_FIELDS = ['menu_tips','view', 'password', 'signature', 'action_id', 'company_id', 'user_email', 'name']
+ SELF_WRITEABLE_FIELDS = ['menu_tips','view', 'password', 'signature', 'action_id', 'company_id', 'user_email', 'name', 'avatar', 'avatar_big']
def write(self, cr, uid, ids, values, context=None):
if not hasattr(ids, '__iter__'):
@@ -771,22 +754,23 @@ class groups_view(osv.osv):
# and introduces the reified group fields
view = self.get_user_groups_view(cr, uid, context)
if view:
-
xml1, xml2 = [], []
xml1.append(E.separator(string=_('Application'), colspan="4"))
for app, kind, gs in self.get_groups_by_application(cr, uid, context):
+ # hide groups in category 'Hidden' (except to group_no_one)
+ attrs = {'groups': 'base.group_no_one'} if app and app.xml_id == 'base.module_category_hidden' else {}
if kind == 'selection':
# application name with a selection field
field_name = name_selection_groups(map(int, gs))
- xml1.append(E.field(name=field_name))
+ xml1.append(E.field(name=field_name, **attrs))
xml1.append(E.newline())
else:
# application separator with boolean fields
app_name = app and app.name or _('Other')
- xml2.append(E.separator(string=app_name, colspan="4"))
+ xml2.append(E.separator(string=app_name, colspan="4", **attrs))
for g in gs:
field_name = name_boolean_group(g.id)
- xml2.append(E.field(name=field_name))
+ xml2.append(E.field(name=field_name, **attrs))
xml = E.field(*(xml1 + xml2), name="groups_id", position="replace")
xml.addprevious(etree.Comment("GENERATED AUTOMATICALLY BY GROUPS"))
diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml
index b41f87c72da..3b0194922ca 100644
--- a/openerp/addons/base/security/base_security.xml
+++ b/openerp/addons/base/security/base_security.xml
@@ -12,28 +12,30 @@
Configuration
+
Employee
+
-
+
Multi Companies
-
+
Extended View
-
+
Technical Features
-
+
User
-
+
Manager
diff --git a/openerp/addons/base/security/ir.model.access.csv b/openerp/addons/base/security/ir.model.access.csv
index 08410cc6357..ac05b726341 100644
--- a/openerp/addons/base/security/ir.model.access.csv
+++ b/openerp/addons/base/security/ir.model.access.csv
@@ -117,9 +117,10 @@
"access_ir_filters","ir_filters_all","model_ir_filters",,1,1,1,1
"access_res_widget","res.widget","model_res_widget","group_erp_manager",1,1,1,1
"access_res_widget_user","res.widget.user","model_res_widget",,1,0,0,0
-"access_res_log_all","res.log","model_res_log",,1,1,1,1
"access_ir_config_parameter","ir_config_parameter","model_ir_config_parameter",,1,0,0,0
"access_ir_mail_server_all","ir_mail_server","model_ir_mail_server",,1,0,0,0
"access_ir_actions_todo_category","ir_actions_todo_category","model_ir_actions_todo_category","group_system",1,1,1,1
"access_ir_actions_client","ir_actions_client all","model_ir_actions_client",,1,0,0,0
"access_ir_needaction_users","ir_needaction_users","model_ir_needaction_users",,1,1,1,1
+"access_ir_needaction_mixin","ir_needaction_mixin","model_ir_needaction_mixin",,1,1,1,1
+
diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py
index efc73d44a58..8ed79a4d615 100644
--- a/openerp/modules/loading.py
+++ b/openerp/modules/loading.py
@@ -212,10 +212,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
delattr(package, kind)
cr.commit()
-
- # mark new res_log records as read
- cr.execute("update res_log set read=True where create_date >= %s", (dt_before_load,))
-
+
cr.commit()
return loaded_modules, processed_modules
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 81fc9b81976..c94a8a51e26 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -709,17 +709,7 @@ class BaseModel(object):
CONCURRENCY_CHECK_FIELD = '__last_update'
def log(self, cr, uid, id, message, secondary=False, context=None):
- if context and context.get('disable_log'):
- return True
- return self.pool.get('res.log').create(cr, uid,
- {
- 'name': message,
- 'res_model': self._name,
- 'secondary': secondary,
- 'res_id': id,
- },
- context=context
- )
+ return _logger.warning("log() is deprecated. Please use OpenChatter notification system instead of the res.log mechanism.")
def view_init(self, cr, uid, fields_list, context=None):
"""Override this method to do specific things when a view on the object is opened."""
@@ -4895,14 +4885,14 @@ class BaseModel(object):
if hasattr(self, 'needaction_get_record_ids'):
ids = self.needaction_get_record_ids(cr, uid, user_id, limit=8192, context=context)
if not ids:
- return (True, 0, [])
+ return [True, 0, []]
if domain:
- new_domain = eval(domain) + [('id', 'in', ids)]
+ new_domain = eval(domain, locals_dict={'uid': user_id}) + [('id', 'in', ids)]
else:
new_domain = [('id', 'in', ids)]
- return (True, self.search(cr, uid, new_domain, limit=limit, order=order, count=True, context=context), ids)
+ return [True, self.search(cr, uid, new_domain, limit=limit, order=order, count=True, context=context), ids]
else:
- return (False, 0, [])
+ return [False, 0, []]
# Transience
def is_transient(self):