[MERGE] merge from trunk addons

[odoo/odoo.git] / addons / email_template / email_template_account_view.xml

diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml
old mode 100644 (file)
new mode 100755 (executable)
index 544ad01..00429ef
--- a/addons/email_template/email_template_account_view.xml
+++ b/addons/email_template/email_template_account_view.xml
@@ -2,7 +2,8 @@
 <openerp>
     <data>
 
-        <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17" groups="base.group_system,base.res_groups_email_template_admin"/>
+        <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17"
+            groups="marketing.group_marketing_user,marketing.group_marketing_manager"/>
         <menuitem name="Emails" id="base.menu_emails" parent="base.marketing_menu" sequence="5"/>
         <menuitem name="Email Template" id="menu_email_template" parent="base.menu_emails"/>
 
@@ -18,16 +19,17 @@
                     <notebook colspan="4">
                         <page string="Outgoing">
                             <separator string="Server Information" colspan="4" />
-                            <group colspan="4">
-                                <field name="smtpserver" select="1" colspan="2" />
-                                <field name="smtpport" select="2" colspan="2" />
-                                <field name="smtpssl" select="2" colspan="2" />
-                                <field name="smtptls" select="2" colspan="2" />
+                            <group colspan="4" col="4">
+                                <field name="smtpserver" select="1"/>
+                                <button name="check_outgoing_connection" type="object" string="Test Outgoing Connection" icon="gtk-network" colspan="2"/>
+                                <field name="smtpport" select="2" />
+                                <field name="smtpssl" select="2" />
+                                <field name="smtptls" select="2" />
+                                <field name="auto_delete" />
                             </group>
-                            <button name="check_outgoing_connection" type="object" string="Test Outgoing Connection" />
                             <separator string="User Information" colspan="4" />
                             <group col="2" colspan="2">
-                                <field name="email_id" select="1" on_change="on_change_emailid(name,email_id)" colspan="2" />
+                                <field name="email_id" select="1" colspan="2" />
                                 <field name="smtppass" password="True" colspan="2" />
                                 <field name="company" select="2" colspan="2" />
                             </group>
@@ -40,10 +42,10 @@
                     </notebook>
                     <group colspan="4" col="10">
                         <field name="state" select="1"/>
-                        <button string="Approve Account" name="button_approval" states="draft" type="workflow"/>
-                        <button string="Suspend Account" name="button_suspended" states="approved" type="workflow"  />
-                        <button string="Request Re-activation" name="get_reapprove" states="suspended" type="workflow" />
-                        <button string="Send/Receive" name="send_receive" states="approved" type="object" />
+                        <button string="Approve Account" name="button_approval" states="draft" type="workflow" icon="terp-camera_test"/>
+                        <button string="Suspend Account" name="button_suspended" states="approved" type="workflow" icon="gtk-cancel"/>
+                        <button string="Request Re-activation" name="get_reapprove" states="suspended" type="workflow" icon="gtk-convert"/>
+                        <button string="Send/Receive" name="send_receive" states="approved" type="object" icon="terp-check"/>
                     </group>
                 </form>
             </field>
@@ -54,14 +56,15 @@
             <field name="model">email_template.account</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree  colors="blue:state in ('draft');black:state in ('suspended','approved')" string="SMTP Server">
-                    <field name="name" select="2" />
-                    <field name="email_id" select="2" />
-                    <field name="smtpuname" select="2" />
-                    <field name="user" select="2" />
-                    <field name="smtpserver" select="2" />
-                    <field name="smtpport" select="2" />
-                    <field name="state" select="2" />
+                <tree colors="blue:state in ('draft');black:state in ('suspended','approved')" string="Email Accounts">
+                    <field name="name" />
+                    <field name="email_id" />
+                    <field name="smtpuname" />
+                    <field name="user" />
+                    <field name="smtpserver" />
+                    <field name="smtpport" />
+                    <field name="auto_delete" />
+                    <field name="state" />
                 </tree>
             </field>
         </record>
@@ -71,16 +74,17 @@
            <field name="model">email_template.account</field>
            <field name="type">search</field>
            <field name="arch" type="xml">
-               <search string="Accounts">
-                    <filter icon="terp-personal" string="My Accounts" name="my" domain="[('user','=',uid)]"/>
-                    <filter icon="terp-personal+" string="Personal Accounts" domain="[('company','=','no')]"/>
-                    <filter icon="terp-go-home" string="Company Accounts" domain="[('company','=','yes')]"/>
-                    <separator orientation="vertical"/>
+               <search string="Email Accounts">
                     <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-camera_test" string="Approved" domain="[('state','=','approved')]"/>
                     <filter icon="terp-emblem-important" string="Suspended" domain="[('state','=','suspended')]"/>
                     <separator orientation="vertical"/>
+                    <filter icon="terp-go-home" string="Company Accounts" domain="[('company','=','yes')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="user" select="1">
+                        <filter icon="terp-personal" help="My Accounts" name="my" domain="[('user','=',uid)]"/>
+                    </field>
                     <field name="name" select="1"/>
-                    <field name="user" select="1"/>
                     <field name="email_id" select="1"/>
                </search>
            </field>
@@ -97,11 +101,21 @@
         </record>
 
         <menuitem name="Configuration" parent="base.marketing_menu"
-         id="base.menu_marketing_config_root" sequence="20" groups="base.group_system"/>
-        <menuitem name="Emails" id="menu_email_template_configuration" parent="base.menu_marketing_config_root" />
+            id="base.menu_marketing_config_root" sequence="20" groups="base.group_system"/>
+
+        <menuitem name="Email Template" id="menu_email_template_configuration" parent="base.menu_marketing_config_root" />
 
         <menuitem name="Email Accounts" id="menu_email_template_account_all" parent="menu_email_template_configuration" action="action_email_template_account_tree_all"/>
 
+        <menuitem name="Configuration" parent="base.menu_tools"
+              id="base.menu_lunch_survey_root" sequence="20" />
+
+        <menuitem name="Email Template" id="menu_email_template_config_tools"
+            parent="base.menu_lunch_survey_root" />
+
+        <menuitem name="Email Accounts" id="menu_email_account_all_tools"
+            parent="menu_email_template_config_tools" action="action_email_template_account_tree_all" />
+
     </data>
 </openerp>