From d57135eaefa4ff9bc0e9c80838a2a3b163e92f4b Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 16 Sep 2011 16:02:52 +0200
Subject: [IMP] fetchmail: Add a new type for the incoming server and generate
 a zip file with the script of the mailgateway and the right configuration

bzr revid: stw@openerp.com-20110916140252-movu1cxjubt0bc44
---
 addons/fetchmail/fetchmail_view.xml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'addons/fetchmail/fetchmail_view.xml')

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 05f62f4b9fb..ceb28284a6c 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -32,15 +32,16 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Server &amp; Login">
-                            <group col="4" colspan="2">
+                            <group col="4" colspan="2" attrs="{'readonly' : [('type', '=', 'private_mta')]}">
                                 <separator string="Server Information" colspan="2"/>
-                                <field name="server" colspan="4"/>
-                                <field name="port" />
+                                <field name="server" colspan="4" attrs="{'required' : [('type', '!=', 'private_mta')]}" />
+                                <field name="port" required="1" attrs="{'required' : [('type', '!=', 'private_mta')]}" />
                                 <field name="is_ssl" select="1" on_change="onchange_server_type(type, is_ssl)"/>
                             </group>
                             <group col="2" colspan="2">
                                 <separator string="Login Information" colspan="2"/>
-                                <field name="user" />
+                                <field name="user" attrs="{'required' : [('type', '!=', 'private_mta')], 'invisible' : [('type', '=', 'private_mta')]}"/>
+                                <field name="user_id" attrs="{'invisible' : [('type', '!=', 'private_mta')], 'required' : [('type', '=', 'private_mta')]}" />
                                 <field name="password" password="True" />
                             </group>
                             <group col="2" colspan="2">
@@ -50,6 +51,13 @@
                             </group>
                             <separator string="Description" colspan="4"/>
                             <field name="note" colspan="4" nolabel="1"/>
+                            <group attrs="{'invisible' : [('type', '!=', 'private_mta')]}" colspan="4">
+                                <separator string="Configuration" colspan="4" />
+                                <field name="configuration" colspan="4" />
+                                <button name="generate_configuration" type="object" string="Generate Configuration" colspan="4" />
+                                <field name="archive_filename" invisible="1" />
+                                <field name="archive" filename="archive_filename" />
+                            </group>
                         </page>
                         <page string="Advanced">
                             <group colspan="2" col="2">
-- 
cgit v1.2.3


From 49ab1f660cfcad019a199b8edf2605b4d54bd288 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 21:26:12 +0200
Subject: [IMP] fetchmail useability

bzr revid: fp@tinyerp.com-20111001192612-bgyiugp815evia5r
---
 addons/fetchmail/fetchmail_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/fetchmail/fetchmail_view.xml')

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 05f62f4b9fb..b322fc40d5c 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -54,7 +54,7 @@
                         <page string="Advanced">
                             <group colspan="2" col="2">
                                 <separator string="Advanced options" colspan="2"/>
-                                <field name="priority"/>
+                                <field name="priority" groups="base.group_extended"/>
                                 <field name="attach"/>
                                 <field name="original"/>
                                 <field name="active" select="1"/>
-- 
cgit v1.2.3


From e70a409af1febb0005b2d3348e4996c19781e29c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 22:02:47 +0200
Subject: [IMP] useability views

bzr revid: fp@tinyerp.com-20111001200247-tqyw0w8zomrq0jil
---
 addons/fetchmail/fetchmail_view.xml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'addons/fetchmail/fetchmail_view.xml')

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index b322fc40d5c..84bcb5778c4 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -26,7 +26,7 @@
             <field name="arch" type="xml">
                 <form string="Incoming Mail Server">
                     <group col="6" colspan="4">
-                        <field name="name" select="1" colspan="4"/>
+                        <field name="name" select="1"/>
                         <field name="type" select="1" on_change="onchange_server_type(type, is_ssl)"/>
                         <field name="date" select="1"/>
                     </group>
@@ -44,14 +44,12 @@
                                 <field name="password" password="True" />
                             </group>
                             <group col="2" colspan="2">
-                                <separator string="Automated Processing" colspan="2"/>
+                                <separator string="Actions to Perform on Incoming Mails" colspan="2"/>
                                 <field name="object_id"/>
-                                <field name="action_id"/>
+                                <field name="action_id" groups="base.group_extended"/>
                             </group>
-                            <separator string="Description" colspan="4"/>
-                            <field name="note" colspan="4" nolabel="1"/>
                         </page>
-                        <page string="Advanced">
+                        <page string="Advanced" groups="base.group_extended">
                             <group colspan="2" col="2">
                                 <separator string="Advanced options" colspan="2"/>
                                 <field name="priority" groups="base.group_extended"/>
@@ -62,7 +60,7 @@
                         </page>
                     </notebook>
                     <group col="6" colspan="4">
-                        <field name="state" select="1"/>
+                        <field name="state"/>
                         <button string="Reset Confirmation" type="object" name="set_draft" icon="gtk-convert" states="done"/>
                         <button string="Test &amp; Confirm" type="object" name="button_confirm_login" states="draft" icon="gtk-apply"/>
                         <button string="Fetch Now" type="object" name="fetch_mail" states="done" icon="gtk-network"/>
-- 
cgit v1.2.3


From ff615022729d20b64680f9ec9f15639d7893d114 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 23:15:29 +0200
Subject: [IMP] some view should not have group_by...

bzr revid: fp@tinyerp.com-20111001211529-0g2jccon81tbjrry
---
 addons/fetchmail/fetchmail_view.xml | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'addons/fetchmail/fetchmail_view.xml')

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 84bcb5778c4..61992629b2a 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -81,13 +81,6 @@
                     <filter string="SSL" icon="terp-camera_test" domain="[('is_ssl','=',True)]" help="If SSL required."/>
                     <separator orientation="vertical"/>
                     <field name="name"/>
-                    <field name="object_id"/>
-                    <newline/>
-                    <group expand="0" string="Group By..." groups="base.group_extended">
-                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    </group>
                 </search>
             </field>
         </record>
-- 
cgit v1.2.3