[MERGE]: merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons1

bzr revid: atp@tinyerp.co.in-20101122074153-fiac6hlojwkianlj

2 files changed, 39 insertions, 22 deletions

diff --git a/addons/document_ics/document_view.xml b/addons/document_ics/document_view.xml
index e15d5edc5a5..40174612539 100644
--- a/addons/document_ics/document_view.xml
+++ b/addons/document_ics/document_view.xml
@@ -17,28 +17,25 @@
         </field>
     </record>
 
-   <record model="ir.ui.view" id="view_document_directory_form">
+    <record model="ir.ui.view" id="view_document_directory_form">
         <field name="name">document.directory</field>
         <field name="model">document.directory</field>
         <field name="type">form</field>
         <field name="inherit_id" ref="view_document_directory_form_1"/>
         <field name="arch" type="xml">
             <field name="report_id" position="replace">
-               <field name="report_id" 
-                            attrs="{'invisible': [('extension','=','.ics')] }"/>
-                <group colspan="4" col="4" attrs="{'invisible': [('extension','!=','.ics')]}">
-                    <separator string="ICS Calendar" colspan="4"/>
-                    <field name="ics_domain"/>
-                    <field name="ics_field_ids" colspan="4">
-                        <tree string="ICS Mapping" editable="bottom">
-                            <field name="name"/>
-                            <field name="fn" />
-                            <field name="field_id" domain="[('model_id','=?',parent.object_id)]"/>
-                            <field name="expr" />
-                        </tree>
-                    </field>
-                </group>
-             </field>       
+                <field name="report_id" domain="[('type', '=', 'ressource'),('model_id','=',parent.ressource_type_id)]"/>
+                <separator string="ICS Calendar" colspan="4"/>
+                <field name="ics_domain"/>
+                <field name="ics_field_ids" colspan="4">
+                    <tree string="ICS Mapping" editable="bottom">
+                        <field name="name"/>
+                        <field name="fn" />
+                        <field name="field_id" domain="[('model_id','=?',parent.object_id)]"/>
+                        <field name="expr" />
+                    </tree>
+                </field>
+            </field>
         </field>
     </record>
 
diff --git a/addons/document_ics/i18n/it.po b/addons/document_ics/i18n/it.po
index 0ad29c9d275..129433644e5 100644
--- a/addons/document_ics/i18n/it.po
+++ b/addons/document_ics/i18n/it.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-22 10:42+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"PO-Revision-Date: 2010-11-21 15:30+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-11-22 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -191,6 +191,11 @@ msgid "ICS Calendar"
 msgstr "Calendario ICS"
 
 #. module: document_ics
+#: sql_constraint:ir.module.module:0
+msgid "The name of the module must be unique !"
+msgstr "Il nome del modulo deve essere unico!"
+
+#. module: document_ics
 #: field:document.directory.ics.fields,name:0
 msgid "ICS Value"
 msgstr "Valore ICS"
@@ -198,6 +203,11 @@ msgstr "Valore ICS"
 #. module: document_ics
 #: selection:document.directory.ics.fields,fn:0
 msgid "Expression as constant"
+msgstr "Espressione come costante"
+
+#. module: document_ics
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
 msgstr ""
 
 #. module: document_ics
@@ -206,6 +216,11 @@ msgid "location"
 msgstr "posizione"
 
 #. module: document_ics
+#: sql_constraint:ir.module.module:0
+msgid "The certificate ID of the module must be unique !"
+msgstr "L'ID certificato del modulo deve essere unico!"
+
+#. module: document_ics
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "XML non valido per Visualizzazione Architettura!"
@@ -218,7 +233,7 @@ msgstr "Nome"
 #. module: document_ics
 #: help:document.directory.ics.fields,fn:0
 msgid "Alternate method                 of calculating the value"
-msgstr ""
+msgstr "Metodo alternativo di calcolo del valore"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,meeting:0
@@ -325,7 +340,7 @@ msgstr "sommario"
 #. module: document_ics
 #: field:document.ics.crm.wizard,lead:0
 msgid "Leads"
-msgstr ""
+msgstr "Iniziative"
 
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_document_ics_crm_wizard
@@ -363,6 +378,11 @@ msgid "dtstamp"
 msgstr ""
 
 #. module: document_ics
+#: sql_constraint:ir.model.fields:0
+msgid "Size of the field can never be less than 1 !"
+msgstr "La dimensione del campo non può mai essere minore di 1!"
+
+#. module: document_ics
 #: help:document.directory.content,fname_field:0
 msgid ""
 "The field of the                         object used in the filename. Has to "