[MERGE] merge with main addons

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

3 files changed, 138 insertions, 0 deletions

diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml
new file mode 100644
index 00000000000..c8e8b1a488e
--- /dev/null
+++ b/addons/mail/data/mail_data.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record forcecreate="True" id="ir_cron_mail_scheduler_action" model="ir.cron">
+            <field name="name">Email Queue Manager</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="interval_number">1</field>
+            <field name="interval_type">hours</field>
+            <field name="numbercall">-1</field>
+            <field eval="False" name="doall"/>
+            <field eval="'mail.message'" name="model"/>
+            <field eval="'process_email_queue'" name="function"/>
+            <field eval="'()'" name="args"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
new file mode 100644
index 00000000000..f9edb8b9e2f
--- /dev/null
+++ b/addons/mail/data/mail_demo.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+
+        <record id="message_blogpost0_attachment0" model="ir.attachment">
+            <field name="name">A cool attachment</field>
+            <field name="datas">PT1Tb21lIGNvb2wgYXR0YWNobWVudD09ClByYWVzZW50IHZlbCBtYXNzYSBzZWQgbWFzc2EgY29uc2VxdWF0IGVnZXN0YXMgaW4gdHJpc3RpcXVlIG9yY2ku</field>
+            <field name="datas_fname">a_cool_attachment</field>
+            <field name="description"></field>
+            <field name="res_name">Mail group</field>
+            <field name="res_model">mail.group</field>
+            <field name="res_id" ref="group_all_company"/>
+            <field name="type">binary</field>
+        </record>
+
+        <record id="message_blogpost0_attachment1" model="ir.attachment">
+            <field name="name">Another clean attachment</field>
+            <field name="datas">PT1Tb21lIGNsZWFuIGF0dGFjaG1lbnQ9PQpOdWxsYSB0dXJwaXMgbGVvLCByaG9uY3VzIHV0IGVnZXN0YXMgc2l0IGFtZXQsIGNvbnNlY3RldHVyIHZpdGFlIHVybmEu</field>
+            <field name="datas_fname">a_clean_attachment</field>
+            <field name="description"></field>
+            <field name="res_name">Mail group</field>
+            <field name="res_model">mail.group</field>
+            <field name="res_id" ref="group_all_company"/>
+            <field name="type">binary</field>
+        </record>
+
+        <record id="message_blogpost0" model="mail.message">
+            <field name="subject">Internal company announce</field>
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="group_all_company"/>
+            <field name="content_subtype">html</field>
+            <field name="body_html"><![CDATA[Lorem ipsum dolor <b>sit amet</b>, consectetur <em>adipiscing elit</em>. Pellentesque et quam sapien, in sagittis tellus.
+Praesent vel massa sed massa consequat egestas in tristique orci. Praesent iaculis libero et neque vehicula iaculis. Vivamus placerat tincidunt orci ac ornare. Proin ut dolor fringilla velit ultricies consequat. Maecenas sit amet ipsum non leo interdum imperdiet. Donec sapien mi, varius a consequat id, consectetur sit amet nulla.
+
+Fusce tempus elit volutpat mi auctor adipiscing. Nam congue luctus suscipit. Duis vestibulum dapibus enim vitae dignissim. Sed tellus libero, venenatis ut mollis ut, luctus quis dui. Sed rhoncus pulvinar orci in consectetur.
+
+Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in dolor in sapien tempus vehicula.]]></field>
+            <field name="type">comment</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="attachment_ids" eval="[(6,0,[ref('message_blogpost0_attachment0'),ref('message_blogpost0_attachment1')])]"/>
+        </record>
+
+        <record id="message_blogpost0_comment0" model="mail.message">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="group_all_company"/>
+            <field name="content_subtype">html</field>
+            <field name="body_html"><![CDATA[That was such a <b>tremendous</b> blogpost !  (first comment)]]></field>
+            <field name="parent_id" ref="message_blogpost0"/>
+            <field name="type">comment</field>
+            <field name="user_id" ref="base.user_root"/>
+        </record>
+
+        <record id="message_blogpost0_comment1" model="mail.message">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="group_all_company"/>
+            <field name="content_subtype">html</field>
+            <field name="body_html"><![CDATA[Agreed !
+Would it be possible to learn more about the author ?  (second comment)]]></field>
+            <field name="parent_id" ref="message_blogpost0"/>
+            <field name="type">comment</field>
+            <field name="user_id" ref="base.user_demo"/>
+        </record>
+
+        <record id="message_blogpost0_comment2_attachment0" model="ir.attachment">
+            <field name="name">Author's full biography</field>
+            <field name="datas">PT1BYm91dCB0aGUgYXV0aG9yPT0KSW50ZWdlciBzb2RhbGVzIGRvbG9yIGV1IGVsaXQgZnJpbmdpbGxhIGJsYW5kaXQu</field>
+            <field name="datas_fname">blogpost_author_biography</field>
+            <field name="description"></field>
+            <field name="res_name">Mail group</field>
+            <field name="res_model">mail.group</field>
+            <field name="res_id" ref="group_all_company"/>
+            <field name="type">binary</field>
+        </record>
+
+        <record id="message_blogpost0_comment2" model="mail.message">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="group_all_company"/>
+            <field name="content_subtype">html</field>
+            <field name="body_html"><![CDATA[Sure: Curabitur tempor bibendum diam, et euismod ante rutrum vel.
+
+In quis purus neque. Integer sodales dolor eu elit fringilla blandit. Maecenas lacus nisi, facilisis sit amet viverra eu, tristique vel augue.
+Donec viverra congue dui eu blandit. In lacinia molestie nulla, ut sagittis risus feugiat eu.
+
+Check the file in attachment for more information !  (third comment)]]></field>
+            <field name="parent_id" ref="message_blogpost0"/>
+            <field name="type">comment</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="attachment_ids" eval="[(4,ref('message_blogpost0_comment2_attachment0'))]"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml
new file mode 100644
index 00000000000..09a6ca29a2d
--- /dev/null
+++ b/addons/mail/data/mail_group_data.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <record model="mail.group" id="group_all_company">
+            <field name="name">All Company</field>
+            <field name="description">All company users can come here and discuss.</field>
+        </record>
+        <record model="mail.group" id="group_sales">
+            <field name="name">Sales</field>
+        </record>
+        <record model="mail.group" id="group_all_employees">
+            <field name="name">All Employees</field>
+            <field name="group_ids" eval="[(4, ref('base.group_user'))]"/>
+        </record>
+
+        <!-- notify all employees of module installation -->
+        <function model="mail.group" name="message_append_note">
+            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
+            <value eval="[ref('mail.group_all_employees')]"/>
+            <value>Welcome to OpenERP!</value>
+            <value>Your homepage is a summary of messages you received and key information about documents you follow.
+
+The top menu bar contains all applications you installed. You can use this &lt;i&gt;Settings&lt;/i&gt; menu to intall more applications, activate others features or give access to new users.
+
+To setup your preferences (name, email signature, avatar), click on the top right corner.</value>
+        </function>
+
+    </data>
+</openerp>