[MERGE] merge with latest stable

[odoo/odoo.git] / addons / base_action_rule / base_action_rule_view.xml

diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index c8adf10..9c78406 100644 (file)
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <menuitem id="base.menu_base_action_rule" name="Automated Actions"
-            groups="base.group_extended,base.group_system"
+            groups="base.group_extended"
             parent="base.menu_base_config" sequence="3" />
 
         <!--
@@ -14,11 +14,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Action Rule">
-                    <field name="name"/>
-                    <field name="model_id" select="1" on_change="onchange_model_id(model_id)"/>
-                    <field name="filter_id" />
-                    <field name="sequence"/>
-                    <field name="active"/>
+                    <group col="6" colspan="4">
+                        <field name="name"/>
+                        <field name="model_id" select="1" on_change="onchange_model_id(model_id)"/>
+                        <field name="filter_id" />
+                        <field name="sequence"/>
+                        <field name="active"/>
+                    </group>
                     <notebook colspan="4">
                         <page string="Conditions">
                             <group col="2" colspan="2" name="model">
@@ -63,11 +65,13 @@
                                 <group col="2" colspan="2" attrs="{'invisible': [('act_remind_user','=',False)]}">
                                     <field name="act_reply_to" attrs="{'required':[('act_remind_user','=',True)]}"/>
                                 </group>
-                                   <separator colspan="4" string="Email Information"/>
-                                   <field name="act_mail_to_user"/>
-                                   <field colspan="4" name="act_mail_to_email"/>
-                                   <field name="act_mail_to_watchers"/>
-                                   <field colspan="4" name="act_email_cc"/>
+                                <separator colspan="4" string="Email Information"/>
+                                <field name="act_email_from" />
+                                <field name="act_email_to" />
+                                <field name="act_mail_to_user"/>
+                                <field colspan="4" name="act_mail_to_email"/>
+                                <field name="act_mail_to_watchers"/>
+                                <field colspan="4" name="act_email_cc"/>
                             <separator colspan="4" string="Email Body"/>
                             <field colspan="4" name="act_mail_body" height="250"
                                nolabel="1" attrs="{'required':[('act_remind_user','=',True)]}" />
@@ -110,6 +114,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_base_action_rule_tree"/>
+            <field name="help">Use automated actions to automatically trigger actions for various screens. Example: a lead created by a specific user may be automatically set to a specific sales team, or an opportunity which still has status pending after 14 days might trigger an automatic reminder email.</field>
         </record>
 
            <menuitem id="menu_base_action_rule_form"