[MERGE] Merged from main branch.

bzr revid: vra@tinyerp.com-20100524081117-s63vktc1m3grcu8v

addons/document_ics/document_demo.xml

@@ -23,32 +23,32 @@
 
     <record model="document.directory.ics.fields" id="dir_field1">
         <field name="name">dtstart</field>
-        <field name="field_id" ref="crm.field_crm_case_create_date"/>
+        <field name="field_id" ref="crm.field_crm_meeting_create_date"/>
         <field name="content_id" ref="dir_content_calendar"/>
     </record>
     <record model="document.directory.ics.fields" id="dir_field6">
         <field name="name">dtend</field>
-        <field name="field_id" ref="crm.field_crm_case_date_deadline"/>
+        <field name="field_id" ref="crm.field_crm_meeting_date_deadline"/>
         <field name="content_id" ref="dir_content_calendar"/>
     </record>
     <record model="document.directory.ics.fields" id="dir_field2">
         <field name="name">summary</field>
-        <field name="field_id" ref="crm.field_crm_case_name"/>
+        <field name="field_id" ref="crm.field_crm_meeting_name"/>
         <field name="content_id" ref="dir_content_calendar"/>
     </record>
     <record model="document.directory.ics.fields" id="dir_field3">
         <field name="name">uid</field>
-        <field name="field_id" ref="field_crm_case_code"/>
+        <field name="field_id" ref="field_crm_meeting_code"/>
         <field name="content_id" ref="dir_content_calendar"/>
     </record>
     <record model="document.directory.ics.fields" id="dir_field4">
         <field name="name">description</field>
-        <field name="field_id" ref="crm.field_crm_case_description"/>
+        <field name="field_id" ref="crm.field_crm_meeting_description"/>
         <field name="content_id" ref="dir_content_calendar"/>
     </record>
     <record model="document.directory.ics.fields" id="dir_field5">
         <field name="name">url</field>
-        <field name="field_id" ref="crm.field_crm_case_email_from"/>
+        <field name="field_id" ref="crm.field_crm_meeting_email_from"/>
         <field name="content_id" ref="dir_content_calendar"/>
     </record>
 

addons/document_ics/document_view.xml

@@ -45,7 +45,7 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="crm.crm_case_form_view_meet"/>
         <field name="arch" type="xml">
-            <field name="priority" position="after">
+            <field name="show_as" position="after">
                 <field name="code"/>
             </field>
         </field>

addons/document_ics/i18n/fr.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 17:33+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-21 20:29+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <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: 2010-04-17 04:18+0000\n"
+"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -37,17 +37,17 @@ msgstr "Erreur ! Vous ne pouvez pas créer de Répertoires récursivement."
 #. module: document_ics
 #: field:document.ics.crm.wizard,jobs:0
 msgid "Jobs Hiring Process"
-msgstr ""
+msgstr "Procédure de recrutement"
 
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "Configure Calendars for CRM Sections"
-msgstr ""
+msgstr "Configure les calendriers pour les sections de la CRM"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,helpdesk:0
 msgid "Helpdesk"
-msgstr ""
+msgstr "Support"
 
 #. module: document_ics
 #: field:document.directory.ics.fields,field_id:0
@@ -57,7 +57,7 @@ msgstr "Champ Open ERP"
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "Next"
-msgstr ""
+msgstr "Suivant"
 
 #. module: document_ics
 #: field:document.directory.ics.fields,content_id:0
@@ -67,7 +67,7 @@ msgstr "Contenu"
 #. module: document_ics
 #: field:document.ics.crm.wizard,meeting:0
 msgid "Calendar of Meetings"
-msgstr ""
+msgstr "Calendrier des Rendez Vous"
 
 #. module: document_ics
 #: model:crm.case.section,name:document_ics.section_meeting
@@ -82,12 +82,14 @@ msgstr "url"
 #. module: document_ics
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nom de modèle invalide pour la définition de l'action"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,bugs:0
 msgid "Used by companies to track bugs and support requests on softwares"
 msgstr ""
+"Utilisé par les sociétés pour suivre des anomalies et des demandes de "
+"supports sur les logiciels"
 
 #. module: document_ics
 #: model:ir.actions.todo,note:document_ics.config_wizard_step_case_section_menu
@@ -95,6 +97,8 @@ msgid ""
 "This Configuration step use to create Calendars in document for all Case "
 "Sections"
 msgstr ""
+"Cette étape de configuration est utilisé pour créer un calendrier dans la  "
+"GED pour toutes les sections"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -107,6 +111,8 @@ msgid ""
 "Help you to organise the jobs hiring process: evaluation, meetings, email "
 "integration..."
 msgstr ""
+"Aide à organiser le processus d'embauche: évaluation, rendez vous, gestion "
+"des emails"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -116,28 +122,30 @@ msgstr "description"
 #. module: document_ics
 #: model:ir.actions.act_window,name:document_ics.action_view_document_ics_config_directories
 msgid "Configure Calendars for Sections "
-msgstr ""
+msgstr "Configurer les Calendriers pour ces Sections "
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,opportunity:0
 msgid "Tracks identified business opportunities for your sales pipeline."
-msgstr ""
+msgstr "Suivi des occasions identifiées d'affaires pour vos canaux de vente."
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,fund:0
 msgid ""
 "This may help associations in their fund raising process and tracking."
 msgstr ""
+"Ceci peut aider les associations dans leur procédure de collecte de fonds et "
+"de suivi."
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,helpdesk:0
 msgid "Manages an Helpdesk service."
-msgstr ""
+msgstr "Diriger un service d'assistance"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,fund:0
 msgid "Fund Raising Operations"
-msgstr ""
+msgstr "Opérations de levée de fonds"
 
 #. module: document_ics
 #: field:document.directory.content,ics_object_id:0
@@ -147,12 +155,12 @@ msgstr "Objet"
 #. module: document_ics
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive sections."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de sections récursives."
 
 #. module: document_ics
 #: model:ir.module.module,shortdesc:document_ics.module_meta_information
 msgid "Support for iCal based on Document Management System"
-msgstr ""
+msgstr "Support iCal basé sur la gestion documentaire"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -173,6 +181,7 @@ msgstr "Valeur ICS"
 #: model:ir.module.module,description:document_ics.module_meta_information
 msgid "Allows to synchronise calendars with others applications."
 msgstr ""
+"Autorise la syncrhonisation des calendriers avec les autres applications."
 
 #. module: document_ics
 #: constraint:ir.ui.view:0
@@ -189,12 +198,12 @@ msgstr ""
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,meeting:0
 msgid "Manages the calendar of meetings of the users."
-msgstr ""
+msgstr "Gère le calendrier des rendez-vous des utilisateurs"
 
 #. module: document_ics
 #: field:document.directory.content,ics_domain:0
@@ -207,6 +216,8 @@ msgid ""
 "Manages the supplier and customers claims, including your corrective or "
 "preventive actions."
 msgstr ""
+"Gérér les réclamations fournisseurs et clients, incluant vos actions "
+"correctives ou préventives."
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -221,17 +232,17 @@ msgstr "Correspondance ICS"
 #. module: document_ics
 #: view:crm.case:0
 msgid "Duration(In Hour)"
-msgstr ""
+msgstr "Durée (en heure)"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,document_ics:0
 msgid "Shared Calendar"
-msgstr ""
+msgstr "Calendrier partagé"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,claims:0
 msgid "Claims"
-msgstr ""
+msgstr "Réclamations"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,phonecall:0
@@ -239,6 +250,8 @@ msgid ""
 "Help you to encode the result of a phone call or to planify a list of phone "
 "calls to process."
 msgstr ""
+"Aide à encoder le résultat d'une conversation téléphonique ou à plannifier "
+"une liste"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -248,12 +261,12 @@ msgstr "dtstart"
 #. module: document_ics
 #: field:document.ics.crm.wizard,phonecall:0
 msgid "Phone Calls"
-msgstr ""
+msgstr "Appels téléphoniques"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,bugs:0
 msgid "Bug Tracking"
-msgstr ""
+msgstr "Suivi des Bugs"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -263,12 +276,12 @@ msgstr "catégories"
 #. module: document_ics
 #: field:document.ics.crm.wizard,lead:0
 msgid "Prospect"
-msgstr ""
+msgstr "Prospect"
 
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "Create Pre-Configured Calendars"
-msgstr ""
+msgstr "Création de calendriers pré-configurer"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -278,7 +291,7 @@ msgstr "créé"
 #. module: document_ics
 #: field:crm.case,code:0
 msgid "Calendar Code"
-msgstr ""
+msgstr "Code Calendrier"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -288,7 +301,7 @@ msgstr "résumé"
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_document_ics_crm_wizard
 msgid "document.ics.crm.wizard"
-msgstr ""
+msgstr "document.ics.crm.wizard"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -308,14 +321,14 @@ msgstr "Correspondance des champs"
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,opportunity:0
 msgid "Business Opportunities"
-msgstr ""
+msgstr "Opportunités d'affaire"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtstamp"
-msgstr ""
+msgstr "dtstamp"