[MERGE] hr_payroll: merge with main addons

bzr revid: psi@tinyerp.com-20120127053414-fjqvbmb057ekmfov

4 files changed, 50 insertions, 45 deletions

diff --git a/addons/document/i18n/nl.po b/addons/document/i18n/nl.po
index 7e8f819b636..30278689f45 100644
--- a/addons/document/i18n/nl.po
+++ b/addons/document/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-12-22 18:44+0000\n"
-"PO-Revision-Date: 2011-01-12 15:28+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-01-22 19:04+0000\n"
+"Last-Translator: Erwin <erwin@endiansolutions.nl>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-23 07:11+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-01-23 05:20+0000\n"
+"X-Generator: Launchpad (build 14700)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -151,7 +151,7 @@ msgstr "Mapnaam moet uniek zijn"
 #. module: document
 #: view:ir.attachment:0
 msgid "Filter on my documents"
-msgstr ""
+msgstr "Filter op mijn documenten"
 
 #. module: document
 #: field:ir.attachment,index_content:0
@@ -170,7 +170,7 @@ msgstr ""
 #. module: document
 #: model:ir.actions.todo.category,name:document.category_knowledge_mgmt_config
 msgid "Knowledge Management"
-msgstr ""
+msgstr "Kennisbeheer"
 
 #. module: document
 #: view:document.directory:0
@@ -204,7 +204,7 @@ msgstr "Mappen per resource"
 #. module: document
 #: view:ir.attachment:0
 msgid "Indexed Content - experimental"
-msgstr ""
+msgstr "Geïndexeerde inhoud - Experimenteel"
 
 #. module: document
 #: field:document.directory.content,suffix:0
@@ -390,6 +390,8 @@ msgid ""
 "When executing this wizard, it will configure your directories automatically "
 "according to modules installed."
 msgstr ""
+"Bij het uitvoeren van deze wizard, zal het automatisch de mappen "
+"configureren op basis van de geïnstalleerde modules."
 
 #. module: document
 #: field:document.directory.content,directory_id:0
@@ -525,7 +527,7 @@ msgstr ""
 #. module: document
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
 msgid "Configure Directories"
-msgstr ""
+msgstr "Geconfigureerde mappen"
 
 #. module: document
 #: field:document.directory.content,include_name:0
@@ -679,7 +681,7 @@ msgstr "Alleen lezen"
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 msgid "Document Directory"
-msgstr ""
+msgstr "Document mappen"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -705,6 +707,11 @@ msgid ""
 "attached to the document, or to print and download any report. This tool "
 "will create directories automatically according to modules installed."
 msgstr ""
+"OpenERP's Document Management System ondersteunt het mappen van virtuele "
+"mappen met documenten. De virtuele map van een document kan worden gebruikt "
+"om de bestanden die bij het document behoren te beheren, of om af te drukken "
+"en te downloaden. Deze tool maakt automatisch mappen op basis van "
+"geïnstalleerde modules."
 
 #. module: document
 #: view:board.board:0
@@ -798,7 +805,7 @@ msgstr "Maand"
 #. module: document
 #: view:report.document.user:0
 msgid "This Months Files"
-msgstr ""
+msgstr "Deze maand bestanden"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_reporting
@@ -864,7 +871,7 @@ msgstr "Bestanden per relatie"
 #. module: document
 #: view:document.configuration:0
 msgid "Configure Direcories"
-msgstr ""
+msgstr "Geconfigureerde mappen"
 
 #. module: document
 #: view:report.document.user:0
@@ -879,7 +886,7 @@ msgstr "Notities"
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
-msgstr ""
+msgstr "Mappen configuratie"
 
 #. module: document
 #: help:document.directory,type:0
@@ -982,7 +989,7 @@ msgstr "Mime Type"
 #. module: document
 #: view:report.document.user:0
 msgid "All Months Files"
-msgstr ""
+msgstr "Alle maanden bestanden"
 
 #. module: document
 #: field:document.directory.content,name:0
diff --git a/addons/document/i18n/tr.po b/addons/document/i18n/tr.po
index 55ff5b033d1..e9f4483671b 100644
--- a/addons/document/i18n/tr.po
+++ b/addons/document/i18n/tr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-12-22 18:44+0000\n"
-"PO-Revision-Date: 2011-06-10 19:43+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2012-01-24 20:09+0000\n"
+"Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-23 07:11+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -150,7 +150,7 @@ msgstr "Klasör adı eşsiz olmalı !"
 #. module: document
 #: view:ir.attachment:0
 msgid "Filter on my documents"
-msgstr ""
+msgstr "Dökümanlarımdaki filtreler"
 
 #. module: document
 #: field:ir.attachment,index_content:0
@@ -169,7 +169,7 @@ msgstr ""
 #. module: document
 #: model:ir.actions.todo.category,name:document.category_knowledge_mgmt_config
 msgid "Knowledge Management"
-msgstr ""
+msgstr "Bilgi Yönetimi"
 
 #. module: document
 #: view:document.directory:0
@@ -203,7 +203,7 @@ msgstr "Her kaynağın klasörü"
 #. module: document
 #: view:ir.attachment:0
 msgid "Indexed Content - experimental"
-msgstr ""
+msgstr "İndekslenmiş İçerik - Deneysel"
 
 #. module: document
 #: field:document.directory.content,suffix:0
@@ -522,7 +522,7 @@ msgstr ""
 #. module: document
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
 msgid "Configure Directories"
-msgstr ""
+msgstr "Klasörleri Ayarla"
 
 #. module: document
 #: field:document.directory.content,include_name:0
@@ -675,7 +675,7 @@ msgstr "Salt Okunur"
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 msgid "Document Directory"
-msgstr ""
+msgstr "Dökümanlar Klasörü"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -794,7 +794,7 @@ msgstr "Ay"
 #. module: document
 #: view:report.document.user:0
 msgid "This Months Files"
-msgstr ""
+msgstr "Bu ayın Dosyaları"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_reporting
@@ -859,7 +859,7 @@ msgstr "Paydaşa göre Dosyalar"
 #. module: document
 #: view:document.configuration:0
 msgid "Configure Direcories"
-msgstr ""
+msgstr "Klasörleri Ayarla"
 
 #. module: document
 #: view:report.document.user:0
@@ -874,7 +874,7 @@ msgstr "Notlar"
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
-msgstr ""
+msgstr "Klasör Ayarları"
 
 #. module: document
 #: help:document.directory,type:0
@@ -969,7 +969,7 @@ msgstr "Mime Türü"
 #. module: document
 #: view:report.document.user:0
 msgid "All Months Files"
-msgstr ""
+msgstr "Bütün Ayların Dosyaları"
 
 #. module: document
 #: field:document.directory.content,name:0
diff --git a/addons/document/i18n/zh_CN.po b/addons/document/i18n/zh_CN.po
index 3f428c4565f..ff0a4c83211 100644
--- a/addons/document/i18n/zh_CN.po
+++ b/addons/document/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-12-22 18:44+0000\n"
-"PO-Revision-Date: 2012-01-12 04:38+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-01-26 04:56+0000\n"
+"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-01-13 04:40+0000\n"
-"X-Generator: Launchpad (build 14664)\n"
+"X-Launchpad-Export-Date: 2012-01-26 05:27+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -148,7 +148,7 @@ msgstr "目录名必须唯一！"
 #. module: document
 #: view:ir.attachment:0
 msgid "Filter on my documents"
-msgstr ""
+msgstr "用于我的文档的过滤器"
 
 #. module: document
 #: field:ir.attachment,index_content:0
@@ -165,7 +165,7 @@ msgstr "如勾选，所有与该记录匹配的附件都会被找到。如不选
 #. module: document
 #: model:ir.actions.todo.category,name:document.category_knowledge_mgmt_config
 msgid "Knowledge Management"
-msgstr ""
+msgstr "知识管理"
 
 #. module: document
 #: view:document.directory:0
@@ -199,7 +199,7 @@ msgstr "每个资源一个目录"
 #. module: document
 #: view:ir.attachment:0
 msgid "Indexed Content - experimental"
-msgstr ""
+msgstr "索引内容——实验性功能"
 
 #. module: document
 #: field:document.directory.content,suffix:0
@@ -381,7 +381,7 @@ msgstr "自动生成的文件列表"
 msgid ""
 "When executing this wizard, it will configure your directories automatically "
 "according to modules installed."
-msgstr ""
+msgstr "当执行此向导时将自动通过已安装的模块进行目录配置。"
 
 #. module: document
 #: field:document.directory.content,directory_id:0
@@ -514,7 +514,7 @@ msgstr ""
 #. module: document
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
 msgid "Configure Directories"
-msgstr ""
+msgstr "配置目录"
 
 #. module: document
 #: field:document.directory.content,include_name:0
@@ -661,7 +661,7 @@ msgstr "只读"
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 msgid "Document Directory"
-msgstr ""
+msgstr "文档目录"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -687,6 +687,8 @@ msgid ""
 "attached to the document, or to print and download any report. This tool "
 "will create directories automatically according to modules installed."
 msgstr ""
+"OpenERP "
+"的文档管理系统支持为文档映射虚拟文件夹。单据的虚拟文件夹将用于管理该单据的附件文件，或者用于打印和下载任何报表。此工具将按照已安装的模块自动创建目录。"
 
 #. module: document
 #: view:board.board:0
@@ -736,7 +738,7 @@ msgstr "外部文件存储设区"
 #: model:ir.actions.act_window,name:document.action_view_wall
 #: view:report.document.wall:0
 msgid "Wall of Shame"
-msgstr "羞愧者名单"
+msgstr "耻辱之墙"
 
 #. module: document
 #: help:document.storage,path:0
@@ -780,7 +782,7 @@ msgstr "月份"
 #. module: document
 #: view:report.document.user:0
 msgid "This Months Files"
-msgstr ""
+msgstr "本月文件"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_reporting
@@ -843,7 +845,7 @@ msgstr "业务伙伴文件"
 #. module: document
 #: view:document.configuration:0
 msgid "Configure Direcories"
-msgstr ""
+msgstr "配置目录"
 
 #. module: document
 #: view:report.document.user:0
@@ -858,7 +860,7 @@ msgstr "备注"
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
-msgstr ""
+msgstr "目录配置"
 
 #. module: document
 #: help:document.directory,type:0
@@ -952,7 +954,7 @@ msgstr "MIME 类型"
 #. module: document
 #: view:report.document.user:0
 msgid "All Months Files"
-msgstr ""
+msgstr "所有月份的文件"
 
 #. module: document
 #: field:document.directory.content,name:0
diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
index 74f3426fc50..9fba954aa0e 100644
--- a/addons/document/security/document_security.xml
+++ b/addons/document/security/document_security.xml
@@ -11,10 +11,6 @@
 <!--        <field name="name">Document / Manager</field>-->
 <!--    </record>-->
 
-    <record id="knowledge.menu_document_configuration" model="ir.ui.menu">
-        <field name="groups_id" eval="[(6,0,[ref('base.group_no_one')])]"/>
-    </record>
-
     <record id="ir_rule_readpublicdirectories0" model="ir.rule">
         <field name="model_id" ref="document.model_document_directory"/>
         <field name="domain_force">['|','|',('group_ids','in',[g.id for g in user.groups_id]), ('user_id', '=', user.id), '&amp;', ('user_id', '=', False), ('group_ids','=',False),  '|','|', ('company_id','=',False), ('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>