[MERGE] Merge with lp:openobject-addons

bzr revid: ysa@tinyerp.co.in-20100513052001-lm485kqokv893ijr

diff --cc addons/base_setup/installer.py
Simple merge

diff --cc addons/crm/crm_view.xml
Simple merge

diff --cc addons/crm/security/ir.model.access.csv
index 37a36fc,b13bc58..c952d64
--- 1/addons/crm/security/ir.model.access.csv
--- 2/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@@ -33,6 -38,8 +33,7 @@@
  "access_crm_phonecall2phonecall","crm.phonecall2phonecall","model_crm_phonecall2phonecall","crm.group_crm_user",1,1,1,1
  "access_crm_phonecall2partner","crm.phonecall2partner","model_crm_phonecall2partner","crm.group_crm_user",1,1,1,1
  "access_crm_phonecall2opportunity","crm.phonecall2opportunity","model_crm_phonecall2opportunity","crm.group_crm_user",1,1,1,1
 -"access_report_crm_helpdesk","report.crm.helpdesk","model_crm_helpdesk_report","crm.group_crm_user",1,1,1,1
  "access_crm_send_mail","crm.send.mail","model_crm_send_mail","crm.group_crm_user",1,1,1,1
+ "access_crm_send_mail_attachment","crm.send.mail.attachment","model_crm_send_mail_attachment","crm.group_crm_user",1,1,1,1
  "access_crm_partner2opportunity","crm.partner2opportunity","model_crm_partner2opportunity","crm.group_crm_user",1,1,1,1
  "access_crm_lead2opportunity_partner","crm.lead2opportunity.partner","model_crm_lead2opportunity_partner","crm.group_crm_user",1,1,1,1

diff --cc addons/document/document_view.xml
Simple merge

diff --cc addons/thunderbird/thunderbird_installer.xml
index 6ee1f50,356282d..1bfdf28
--- 1/addons/thunderbird/thunderbird_installer.xml
--- 2/addons/thunderbird/thunderbird_installer.xml
+++ b/addons/thunderbird/thunderbird_installer.xml
@@@ -25,12 -29,15 +29,13 @@@
                    <newline/>
  
                    <field name="plugin_file" filename="name"/>
 -                  <button name="process_plugin"  icon="gtk-execute" string="Get Plugin File" type="object"/>
                    <newline/>
                    <field name="pdf_file" filename="pdf_name"/>
 -                  <button name="process_pdf_file"  icon="gtk-execute" string="Get Plugin Installation File" type="object"/>
                    <newline/>
                    <separator string="Thunderbird plugin installation note." colspan="4"/>
 -                  <label colspan="8" string="Save The thunderbird plug­in Follow the following step to install thunderbird plug­in ? 1. From Menu Bar, Open Tools ­> Add ons. 2. Now click on install button and a browser window will appear. 3. Just select the (.xpi) file from thunderbird/plugin directory and click ok, a new software installation window will appear and within a short time Install Now  button will be enabled. 4. Click on Install Now and restart Thunderbird. 5. Now Thunderbird plug­in is installed."/>
 +                  <field name="description" nolabel="1" colspan="8"/>
                </group>
+               </group>
            </data>
        </field>
      </record>