[MERGE] merge with main addons

bzr revid: psi@tinyerp.com-20120806061113-1ck1nrda2sdq06im

6 files changed, 52 insertions, 41 deletions

diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index d8e42703efc..d9ad9a09675 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -29,7 +29,7 @@ This is a complete document management system.
 ==============================================
 
     * User Authentication
-    * Document Indexation :- .pptx and .docx files are not supported in Windows platform.
+    * Document Indexation:- .pptx and .docx files are not supported in Windows platform.
     * Dashboard for Document that includes:
         * New Files (list)
         * Files by Resource Type (graph)
@@ -37,8 +37,8 @@ This is a complete document management system.
         * Files Size by Month (graph)
 
 ATTENTION:
-    - When you install this module in a running company that have already PDF files stored into the database,
-      you will lose them all.
+    - When you install this module in a running company that have already PDF 
+      files stored into the database, you will lose them all.
     - After installing this module PDF's are no longer stored into the database,
       but in the servers rootpad like /server/bin/filestore.
 """,
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 1b1864cabe0..8dab7756b91 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -41,7 +41,6 @@
             <field name="arch" type="xml">
                 <search string="Search Document Storage">
                     <field name="name" string="Document Storage"/>
-                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                     </group>
@@ -172,20 +171,15 @@
             <field name="arch" type="xml">
                 <search string="Search Document Directory">
                     <field name="name" string="Document Directory"/>
-                    <separator orientation="vertical"/>
                     <filter string="Static" domain="[('type','=','directory')]"/>
                     <filter string="Resources" icon="terp-personal" domain="[('type','=','ressource')]"/>
-                    <separator orientation="vertical"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="storage_id" />
                     <field name="user_id" />
-                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                         <filter string="Storage" domain="[]" icon="terp-accessories-archiver" context="{'group_by':'storage_id'}"/>
-                        <separator orientation="vertical" groups="base.group_multi_company"/>
                         <filter string="Company" domain="[]" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     </group>
                </search>
@@ -269,11 +263,7 @@
             <field name="inherit_id" ref="base.view_attachment_search"/>
             <field name="arch" type="xml">
                 <xpath expr="//filter[@name='my_documents_filter']" position="replace">
-                    <filter name="my_documents_filter" 
-                            string="My Document(s)"
-                            icon="terp-personal"
-                            domain="[('user_id','=',uid)]"
-                            help="Filter on my documents"/>
+                    <filter name="my_documents_filter" string="My Document(s)" icon="terp-personal" domain="[('user_id','=',uid)]" help="Filter on my documents"/>
                 </xpath>
                 <xpath expr="//field[@name='create_uid']" position="replace">
                     <field name="user_id"/>
@@ -325,7 +315,14 @@
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">ir.attachment</field>
         <field name="view_type">form</field>
-        <field name="help">The Documents repository gives you access to all attachments, such as mails, project documents, invoices etc.</field>
+        <field name="help" type="html">
+          <p class="oe_view_nocontent_create">
+            Click to create a new document. 
+          </p><p>
+            The Documents repository gives you access to all attachments, such
+            as mails, project documents, invoices etc.
+          </p>
+        </field>
     </record>
     <menuitem name="Documents" id="menu_document_doc" parent="knowledge.menu_document" sequence="0"/>
     <menuitem
diff --git a/addons/document/i18n/pt_BR.po b/addons/document/i18n/pt_BR.po
index 3287ce425aa..f26313d446a 100644
--- a/addons/document/i18n/pt_BR.po
+++ b/addons/document/i18n/pt_BR.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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:58+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 18:51+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\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-07-14 06:12+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -385,6 +385,8 @@ msgid ""
 "When executing this wizard, it will configure your directories automatically "
 "according to modules installed."
 msgstr ""
+"Quando executar este assistente, ele irá configurar seus diretórios "
+"automaticamente de acordo com os módulos instalados."
 
 #. module: document
 #: field:document.directory.content,directory_id:0
@@ -558,6 +560,8 @@ msgid ""
 "Along with Parent Model, this ID attaches this folder to a specific record "
 "of Parent Model."
 msgstr ""
+"Junto com o Modelo Parente, este ID anexa esta pasta para um registro "
+"específico ou um Modelo Parente"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -613,6 +617,10 @@ msgid ""
 "record, just like attachments. Don't put a parent directory if you select a "
 "parent model."
 msgstr ""
+"Se você colocar um objeto aqui, este modelo de diretório aparecerá abaixo "
+"desses objetos. Alguns diretórios são \"Anexados\" a um modelo ou registro "
+"específico,  como anexos. Não coloque um diretório parente se você "
+"selecionar um modelo parente."
 
 #. module: document
 #: view:document.directory:0
@@ -695,6 +703,11 @@ msgid ""
 "attached to the document, or to print and download any report. This tool "
 "will create directories automatically according to modules installed."
 msgstr ""
+"O sistema de controle de documentos do OpenErp suporta mapear pastas "
+"virtuais com documentos. A pasta virtual de um documento pode ser usada para "
+"gerenciar os arquivos anexados ao documento, os para exibir ou fazer "
+"download de qualquer relatório. Esta ferramenta irá criar diretórios "
+"automaticamente de acordo com os módulos instalados."
 
 #. module: document
 #: view:board.board:0
@@ -744,12 +757,12 @@ msgstr "Armazenamento externo de arquivo"
 #: model:ir.actions.act_window,name:document.action_view_wall
 #: view:report.document.wall:0
 msgid "Wall of Shame"
-msgstr ""
+msgstr "Mural da Vergonha"
 
 #. module: document
 #: help:document.storage,path:0
 msgid "For file storage, the root path of the storage"
-msgstr ""
+msgstr "Para armazenamento de arquivos, o caminho raiz do armazenamento"
 
 #. module: document
 #: model:ir.model,name:document.model_report_files_partner
@@ -764,7 +777,7 @@ msgstr "Campo"
 #. module: document
 #: model:ir.model,name:document.model_document_directory_dctx
 msgid "Directory Dynamic Context"
-msgstr ""
+msgstr "Diretório Dinâmico"
 
 #. module: document
 #: field:document.directory,ressource_parent_type_id:0
@@ -814,7 +827,7 @@ msgstr "Todos Arquivos do Usuário"
 #. module: document
 #: model:ir.model,name:document.model_report_document_wall
 msgid "Users that did not inserted documents since one month"
-msgstr ""
+msgstr "Usuários não inseriram documentos a mais de um mês"
 
 #. module: document
 #: model:ir.actions.act_window,help:document.action_document_file_form
@@ -822,11 +835,13 @@ msgid ""
 "The Documents repository gives you access to all attachments, such as mails, "
 "project documents, invoices etc."
 msgstr ""
+"O repositório de documentos lhe dá acesso a todos os anexos, como emails, "
+"documentos de projetos, faturas, etc"
 
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
-msgstr ""
+msgstr "Para cada entrada aqui, arquivos virtuais irão aparecer nesta pasta"
 
 #. module: document
 #: model:ir.model,name:document.model_ir_attachment
@@ -851,7 +866,7 @@ msgstr "Arquivos Por Parceiro"
 #. module: document
 #: view:ir.attachment:0
 msgid "Indexed Content - experimental"
-msgstr ""
+msgstr "Conteúdo Indexado - experimental"
 
 #. module: document
 #: view:report.document.user:0
@@ -877,6 +892,11 @@ msgid ""
 "resources automatically possess sub-directories for each of resource types "
 "defined in the parent directory."
 msgstr ""
+"Cada diretório pode ter o tipo Estático ou ser anexado a um outro recurso. "
+"Um diretório estático, como em sistemas operacionais, é o formato clássico "
+"que contém um conjunto de arquivos. Os diretórios anexados em recursos de "
+"sistema automaticamente possuem sub-diretórios para cada tipo de recurso "
+"definido no diretório pai"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -896,6 +916,8 @@ msgid ""
 "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
 "what is typed here."
 msgstr ""
+"Nome do campo. Note que o prefixo \"dctx_\" será preposto ao que for "
+"digitado aqui."
 
 #. module: document
 #: field:document.directory,name:0
@@ -951,6 +973,8 @@ msgid ""
 "These groups, however, do NOT apply to children directories, which must "
 "define their own groups."
 msgstr ""
+"Estes grupos, no entanto, NÃO se aplicam a diretórios filhos, que precisam "
+"definir seus próprios grupos."
 
 #. module: document
 #: field:document.directory.content.type,mimetype:0
@@ -960,7 +984,7 @@ msgstr "Mime Type"
 #. module: document
 #: view:report.document.user:0
 msgid "All Months Files"
-msgstr ""
+msgstr "Arquivos de todos os meses"
 
 #. module: document
 #: field:document.directory.content,name:0
@@ -982,7 +1006,7 @@ msgstr "Armazenamento interno de arquivo"
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "O diretório precisa ter um pai ou um armazenamento"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_directory_tree
diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index 273be7effa4..b4f423460d7 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -375,7 +375,7 @@ class node_class(object):
         could do various things.
         Should also consider node<->content, dir<->dir moves etc.
 
-        Move operations, as instructed from APIs (eg. request from DAV) could
+        Move operations, as instructed from APIs (e.g. request from DAV) could
         use this function.
         """
         raise NotImplementedError(repr(self))
diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml
index 98016d2fee2..6b3708d1a2f 100644
--- a/addons/document/report/document_report_view.xml
+++ b/addons/document/report/document_report_view.xml
@@ -41,13 +41,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="All users files">
-                    <group>
-                        <field name="name"
-                            filter_domain="['|', '|',('name','ilike',self), ('user','ilike',self), ('directory','ilike',self)]"
-                            string="Users File"/>
-                        <separator orientation="vertical"/>
-                        <field name="month"/>
-                    </group>
+                    <field name="name" filter_domain="['|', '|',('name','ilike',self), ('user','ilike',self), ('directory','ilike',self)]" string="Users File"/>
+                    <field name="month"/>
                </search>
             </field>
         </record>
diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml
index d924e471aca..47cc2c6da3d 100644
--- a/addons/document/wizard/document_configuration_view.xml
+++ b/addons/document/wizard/document_configuration_view.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
     <record id="view_auto_config_form" model="ir.ui.view">
@@ -29,15 +30,9 @@
         <field name="view_mode">form</field>
         <field name="target">new</field>
     </record>
-    
-    <record id="category_knowledge_mgmt_config" model="ir.actions.todo.category">
-        <field name="name">Knowledge Management</field>
-        <field name="sequence">5</field>
-    </record>    
 
     <record model="ir.actions.todo" id="config_auto_directory">
         <field name="action_id" ref="action_config_auto_directory"/>
-        <field name="category_id" ref="category_knowledge_mgmt_config"/>
         <field name="type">automatic</field>
     </record>
   </data>