From b931b05bb902efca78fa0df363dda1ff29d5bf3a Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Mon, 7 Feb 2011 11:03:04 +0530
Subject: [IMP] replace mailgate_message to email_message in crm, fetchamil and
 project_issue module.

bzr revid: ysa@tinyerp.com-20110207053304-yak3ruc2os2lah7t
---
 addons/fetchmail/fetchmail_view.xml | 48 ++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

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

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 7d55f9f5a7a..d029ab5b97a 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    
+
         <record model="ir.ui.view" id="view_email_server_tree">
             <field name="name">email.server.tree</field>
             <field name="model">email.server</field>
@@ -18,7 +18,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="view_email_server_form">
             <field name="name">email.server.form</field>
             <field name="model">email.server</field>
@@ -68,7 +68,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="view_email_server_search">
             <field name="name">email.server.search</field>
             <field name="model">email.server</field>
@@ -91,7 +91,7 @@
                 </search>
             </field>
         </record>
-        
+
         <record model="ir.actions.act_window" id="action_email_server_tree">
             <field name="name">Email Servers</field>
             <field name="res_model">email.server</field>
@@ -101,18 +101,18 @@
             <field name="search_view_id" ref="view_email_server_search"/>
         </record>
 
-        <menuitem 
-            parent="base.menu_mail_gateway" 
+        <menuitem
+            parent="base.menu_mail_gateway"
             id="menu_action_fetchmail_server_tree"
-            action="action_email_server_tree" 
+            action="action_email_server_tree"
             name="Email Servers"
         />
-        
-      <record model="ir.ui.view" id="mailgate_message_tree_view">
-	      <field name="name">mailgate.message.tree</field>
-	      <field name="model">mailgate.message</field>
+
+      <record model="ir.ui.view" id="email_message_tree_view">
+	      <field name="name">email.message.tree</field>
+	      <field name="model">email.message</field>
 	      <field name="type">tree</field>
-	      <field name="inherit_id" ref="mail_gateway.view_mailgate_message_tree"/>
+	      <field name="inherit_id" ref="email.view_email_message_tree"/>
 	      <field name="arch" type="xml">
 	          <field name="user_id" position="after">
 	              <field name="server_id" select="1"/>
@@ -120,12 +120,12 @@
 	          </field>
 	      </field>
       </record>
-      
-      <record model="ir.ui.view" id="mailgate_message_search_view">
-	      <field name="name">mailgate.message.inherit.search</field>
-	      <field name="model">mailgate.message</field>
+
+      <record model="ir.ui.view" id="email_message_search_view">
+	      <field name="name">email.message.inherit.search</field>
+	      <field name="model">email.message</field>
 	      <field name="type">search</field>
-	      <field name="inherit_id" ref="mail_gateway.view_mailgate_message_search"/>
+	      <field name="inherit_id" ref="email.view_email_message_search"/>
 	      <field name="arch" type="xml">
 			<xpath expr="/search/field[@name='name']" position="before">
 			     <filter string="Emails" name="emails" domain="[('server_id','!=',False)]" icon="terp-mail-message-new"/>
@@ -136,24 +136,24 @@
             </xpath>
 	      </field>
       </record>
-      
+
       <record id="action_view_mail_message_emails" model="ir.actions.act_window">
             <field name="name">Messages</field>
-            <field name="res_model">mailgate.message</field>
+            <field name="res_model">email.message</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="context">{'search_default_emails': 1}</field>
-            <field name="search_view_id" ref="mailgate_message_search_view"/>
+            <field name="search_view_id" ref="email_message_search_view"/>
       </record>
-        
+
       <menuitem id="base.menu_email_gateway_form"
                parent="base.menu_mail_gateway" action="action_view_mail_message_emails" />
 
-      <act_window 
+      <act_window
             context="{'server_id': active_id}"
             domain="[('server_id', '=', active_id)]"
             id="act_server_history" name="Emails"
-            res_model="mailgate.message" src_model="email.server"/>
-            
+            res_model="email.message" src_model="email.server"/>
+
     </data>
 </openerp>
-- 
cgit v1.2.3


From 93f54b8f038f370e8325429f7f0f017ad49475b1 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Mon, 7 Feb 2011 12:59:06 +0530
Subject: [IMP] email, email_template and email_gateway related changes done in
 addons module..

bzr revid: ysa@tinyerp.com-20110207072906-knh218shj8ufyxu7
---
 addons/fetchmail/fetchmail_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index d029ab5b97a..b823c586dbf 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -102,7 +102,7 @@
         </record>
 
         <menuitem
-            parent="base.menu_mail_gateway"
+            parent="email.menu_email_message_tools"
             id="menu_action_fetchmail_server_tree"
             action="action_email_server_tree"
             name="Email Servers"
@@ -147,7 +147,7 @@
       </record>
 
       <menuitem id="base.menu_email_gateway_form"
-               parent="base.menu_mail_gateway" action="action_view_mail_message_emails" />
+               parent="email.menu_email_message_tools" action="action_view_mail_message_emails" />
 
       <act_window
             context="{'server_id': active_id}"
-- 
cgit v1.2.3


From 43f06992375ebd7d258671fa3151deb6eb7e359b Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Mon, 7 Feb 2011 14:25:38 +0530
Subject: [IMP] improve view in email and fetchmail module.

bzr revid: ysa@tinyerp.com-20110207085538-4os2e6toajhjey36
---
 addons/fetchmail/fetchmail_view.xml | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index b823c586dbf..35685e46e4c 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -116,7 +116,6 @@
 	      <field name="arch" type="xml">
 	          <field name="user_id" position="after">
 	              <field name="server_id" select="1"/>
-	              <field name="ref_id"/>
 	          </field>
 	      </field>
       </record>
-- 
cgit v1.2.3


From 26447d3f5092b22d60e8d519c2e37360ce52775e Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Tue, 8 Feb 2011 14:23:11 +0530
Subject: [MOV] change module name email to emails

bzr revid: ysa@tinyerp.com-20110208085311-yepv15l0pskvrmc2
---
 addons/fetchmail/fetchmail_view.xml | 8 ++++----
 1 file changed, 4 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 35685e46e4c..591fe944111 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -102,7 +102,7 @@
         </record>
 
         <menuitem
-            parent="email.menu_email_message_tools"
+            parent="emails.menu_email_message_tools"
             id="menu_action_fetchmail_server_tree"
             action="action_email_server_tree"
             name="Email Servers"
@@ -112,7 +112,7 @@
 	      <field name="name">email.message.tree</field>
 	      <field name="model">email.message</field>
 	      <field name="type">tree</field>
-	      <field name="inherit_id" ref="email.view_email_message_tree"/>
+	      <field name="inherit_id" ref="emails.view_email_message_tree"/>
 	      <field name="arch" type="xml">
 	          <field name="user_id" position="after">
 	              <field name="server_id" select="1"/>
@@ -124,7 +124,7 @@
 	      <field name="name">email.message.inherit.search</field>
 	      <field name="model">email.message</field>
 	      <field name="type">search</field>
-	      <field name="inherit_id" ref="email.view_email_message_search"/>
+	      <field name="inherit_id" ref="emails.view_email_message_search"/>
 	      <field name="arch" type="xml">
 			<xpath expr="/search/field[@name='name']" position="before">
 			     <filter string="Emails" name="emails" domain="[('server_id','!=',False)]" icon="terp-mail-message-new"/>
@@ -146,7 +146,7 @@
       </record>
 
       <menuitem id="base.menu_email_gateway_form"
-               parent="email.menu_email_message_tools" action="action_view_mail_message_emails" />
+               parent="emails.menu_email_message_tools" action="action_view_mail_message_emails" />
 
       <act_window
             context="{'server_id': active_id}"
-- 
cgit v1.2.3


From 6d27c8d43661e958c6b2936c4100be4f4cd869fa Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Wed, 9 Feb 2011 12:53:36 +0530
Subject: [IMP] add access rules in emails and email_gateway module. remove
 message menu in fetch_mail.

bzr revid: ysa@tinyerp.com-20110209072336-qcv2nvl3eavq08ws
---
 addons/fetchmail/fetchmail_view.xml | 3 ---
 1 file changed, 3 deletions(-)

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

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 591fe944111..1563b66bf4f 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -145,9 +145,6 @@
             <field name="search_view_id" ref="email_message_search_view"/>
       </record>
 
-      <menuitem id="base.menu_email_gateway_form"
-               parent="emails.menu_email_message_tools" action="action_view_mail_message_emails" />
-
       <act_window
             context="{'server_id': active_id}"
             domain="[('server_id', '=', active_id)]"
-- 
cgit v1.2.3


From 53dc88ecaa0ea5233223a3b954e8af7e4db2a006 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 15 Feb 2011 13:01:50 +0530
Subject: [IMP+FIX] emails: menu name improvement for Incomming server and
 Outgoing Server and fix regression in markertin compain module

bzr revid: hmo@tinyerp.com-20110215073150-q3r9hyk41ryn1jjx
---
 addons/fetchmail/fetchmail_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 1563b66bf4f..f03d8f91a72 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -93,7 +93,7 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_email_server_tree">
-            <field name="name">Email Servers</field>
+            <field name="name">Incomming Servers</field>
             <field name="res_model">email.server</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -102,10 +102,10 @@
         </record>
 
         <menuitem
-            parent="emails.menu_email_message_tools"
+            parent="emails.menu_config_email"
             id="menu_action_fetchmail_server_tree"
             action="action_email_server_tree"
-            name="Email Servers"
+            name="Incomming Servers"
         />
 
       <record model="ir.ui.view" id="email_message_tree_view">
-- 
cgit v1.2.3


From 8df17faa84cd69bdb65b7824e936ec64fc37f921 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Mon, 28 Feb 2011 14:39:19 +0530
Subject: [IMP] emails :- add email_from field in search view and remove email
 filter.

bzr revid: ysa@tinyerp.com-20110228090919-r68zey4af7u8btze
---
 addons/fetchmail/fetchmail_view.xml | 4 ----
 1 file changed, 4 deletions(-)

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

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index f03d8f91a72..fec467083a7 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -126,10 +126,6 @@
 	      <field name="type">search</field>
 	      <field name="inherit_id" ref="emails.view_email_message_search"/>
 	      <field name="arch" type="xml">
-			<xpath expr="/search/field[@name='name']" position="before">
-			     <filter string="Emails" name="emails" domain="[('server_id','!=',False)]" icon="terp-mail-message-new"/>
-			     <separator orientation="vertical"/>
-			</xpath>
 			<xpath expr="/search/group/filter[@string='Thread']" position="before">
                 <filter string="Mail Server" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'server_id'}"/>
             </xpath>
-- 
cgit v1.2.3


From e1afe5828aa5bc65a61ee6143a2dabd2fa6c0e33 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Thu, 10 Mar 2011 13:09:00 +0530
Subject: [IMP] change module name emails to email and related to changes in
 addons all module. move email_gateway module file in email module and also
 related changes in related module..

bzr revid: ysa@tinyerp.com-20110310073900-ivesygpb7cdwpp43
---
 addons/fetchmail/fetchmail_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index fec467083a7..be3b2184a3e 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -102,7 +102,7 @@
         </record>
 
         <menuitem
-            parent="emails.menu_config_email"
+            parent="email.menu_config_email"
             id="menu_action_fetchmail_server_tree"
             action="action_email_server_tree"
             name="Incomming Servers"
@@ -112,7 +112,7 @@
 	      <field name="name">email.message.tree</field>
 	      <field name="model">email.message</field>
 	      <field name="type">tree</field>
-	      <field name="inherit_id" ref="emails.view_email_message_tree"/>
+	      <field name="inherit_id" ref="email.view_email_message_tree"/>
 	      <field name="arch" type="xml">
 	          <field name="user_id" position="after">
 	              <field name="server_id" select="1"/>
@@ -124,7 +124,7 @@
 	      <field name="name">email.message.inherit.search</field>
 	      <field name="model">email.message</field>
 	      <field name="type">search</field>
-	      <field name="inherit_id" ref="emails.view_email_message_search"/>
+	      <field name="inherit_id" ref="email.view_email_message_search"/>
 	      <field name="arch" type="xml">
 			<xpath expr="/search/group/filter[@string='Thread']" position="before">
                 <filter string="Mail Server" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'server_id'}"/>
-- 
cgit v1.2.3


From 47a85e9f8f0fadf16d679a2f1fdbef0ef1c59440 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Mon, 4 Apr 2011 15:15:52 +0530
Subject: [IMP] mail: rename module email to mail because of parsing error

bzr revid: rha@tinyerp.com-20110404094552-j2rdq2sbeqrbffgn
---
 addons/fetchmail/fetchmail_view.xml | 8 ++++----
 1 file changed, 4 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 2bbe251856a..785cec55c5d 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -102,7 +102,7 @@
         </record>
 
         <menuitem
-            parent="email.menu_config_email"
+            parent="mail.menu_config_email"
             id="menu_action_fetchmail_server_tree"
             action="action_email_server_tree"
             name="Incomming Servers"
@@ -112,7 +112,7 @@
 	      <field name="name">email.message.tree</field>
 	      <field name="model">email.message</field>
 	      <field name="type">tree</field>
-	      <field name="inherit_id" ref="email.view_email_message_tree"/>
+	      <field name="inherit_id" ref="mail.view_email_message_tree"/>
 	      <field name="arch" type="xml">
 	          <field name="user_id" position="after">
 	              <field name="server_id" select="1"/>
@@ -124,7 +124,7 @@
 	      <field name="name">email.message.inherit.search</field>
 	      <field name="model">email.message</field>
 	      <field name="type">search</field>
-	      <field name="inherit_id" ref="email.view_email_message_search"/>
+	      <field name="inherit_id" ref="mail.view_email_message_search"/>
 	      <field name="arch" type="xml">
 			<xpath expr="/search/group/filter[@string='Thread']" position="before">
                 <filter string="Mail Server" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'server_id'}"/>
@@ -141,7 +141,7 @@
             <field name="search_view_id" ref="email_message_search_view"/>
       </record>
 
-      <act_window 
+      <act_window
             context="{'search_default_server_id': [active_id], 'default_server_id': active_id}"
             id="act_server_history" name="Emails"
             res_model="email.message" src_model="email.server"/>
-- 
cgit v1.2.3


From 8ae0447cc08c7cd198b4b5141e85c04831f91510 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Tue, 5 Apr 2011 17:55:10 +0530
Subject: [IMP] mail: improvements in email.message view and rename the sortcut
 'Attachments' as 'Messages' for fetchmail form view and also changed domain
 for that

bzr revid: rha@tinyerp.com-20110405122510-2udrv4a7pfa7446u
---
 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 785cec55c5d..883c816bf7f 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -143,7 +143,7 @@
 
       <act_window
             context="{'search_default_server_id': [active_id], 'default_server_id': active_id}"
-            id="act_server_history" name="Emails"
+            id="act_server_history" name="Messages" domain="[('history', '=', True), ('server_id', '=', active_id)]"
             res_model="email.message" src_model="email.server"/>
 
     </data>
-- 
cgit v1.2.3


From 9219ef08234f7e7e8e8f2aa7569adecba7b1f01c Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 19 May 2011 11:31:01 +0530
Subject: [IMP]fetchmail : In the  form view of Setup your email server : add
 icon on button

bzr revid: aag@tinyerp.co.in-20110519060101-eksvmy4907mz8bx6
---
 addons/fetchmail/fetchmail_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 096a83bfa4e..99f421ac4a5 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -61,9 +61,9 @@
                     </notebook>
                     <group col="6" colspan="4">
                         <field name="state" select="1"/>
-                        <button string="Confirm" type="object" name="button_confirm_login" states="draft"/>
+                        <button string="Confirm" type="object" name="button_confirm_login" states="draft" icon="gtk-apply"/>
                         <button string="Fetch Emails" type="object" name="button_fetch_mail" states="done"/>
-                        <button string="Set to Draft" type="object" name="set_draft"/>
+                        <button string="Set to Draft" type="object" name="set_draft" icon="gtk-convert"/>
                     </group>
                 </form>
             </field>
-- 
cgit v1.2.3


From 8f9f45ea948d1ffecb79601e860d522fc6686c2d Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 22 Aug 2011 19:16:59 +0200
Subject: [IMP] all: next pass of review/renaming for new mail API

bzr revid: odo@openerp.com-20110822171659-zxho36a6n628i10q
---
 addons/fetchmail/fetchmail_view.xml | 14 +++++++-------
 1 file changed, 7 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 bdf25b40f74..d3470cec6eb 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -109,8 +109,8 @@
         />
 
       <record model="ir.ui.view" id="email_message_tree_view">
-	      <field name="name">email.message.tree</field>
-	      <field name="model">email.message</field>
+	      <field name="name">mail.message.tree</field>
+	      <field name="model">mail.message</field>
 	      <field name="type">tree</field>
 	      <field name="inherit_id" ref="mail.view_email_message_tree"/>
 	      <field name="arch" type="xml">
@@ -121,8 +121,8 @@
       </record>
 
       <record model="ir.ui.view" id="email_message_search_view">
-	      <field name="name">email.message.inherit.search</field>
-	      <field name="model">email.message</field>
+	      <field name="name">mail.message.inherit.search</field>
+	      <field name="model">mail.message</field>
 	      <field name="type">search</field>
 	      <field name="inherit_id" ref="mail.view_email_message_search"/>
 	      <field name="arch" type="xml">
@@ -134,7 +134,7 @@
 
       <record id="action_view_mail_message_emails" model="ir.actions.act_window">
             <field name="name">Messages</field>
-            <field name="res_model">email.message</field>
+            <field name="res_model">mail.message</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="context">{'search_default_emails': 1}</field>
@@ -143,8 +143,8 @@
 
       <act_window
             context="{'search_default_server_id': [active_id], 'default_server_id': active_id}"
-            id="act_server_history" name="Messages" domain="[('history', '=', True), ('server_id', '=', active_id)]"
-            res_model="email.message" src_model="email.server"/>
+            id="act_server_history" name="Messages" domain="[('email_from', '!=', False), ('server_id', '=', active_id)]"
+            res_model="mail.message" src_model="email.server"/>
 
     </data>
 </openerp>
-- 
cgit v1.2.3


From d81f1cd942b0678fe9d4b63c3e0755654755e79c Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 8 Sep 2011 03:07:00 +0200
Subject: [IMP] fetchmail: review+cleanup

bzr revid: odo@openerp.com-20110908010700-n7fk9hzwb60v80cq
---
 addons/fetchmail/fetchmail_view.xml | 84 +++++++++++++++++--------------------
 1 file changed, 39 insertions(+), 45 deletions(-)

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

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index d3470cec6eb..5f5c094a454 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -7,12 +7,12 @@
             <field name="model">email.server</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('waiting');gray:state in('done')" string="POP/IMAP Servers">
+                <tree colors="blue:state in ('draft');" string="POP/IMAP Servers">
                     <field name="name"/>
                     <field name="type"/>
-                    <field name="user"/>
                     <field name="is_ssl"/>
                     <field name="object_id"/>
+                    <field name="date"/>
                     <field name="message_ids" string="# of emails"/>
                     <field name="state"/>
                 </tree>
@@ -29,16 +29,14 @@
                         <field name="name" select="1" colspan="4"/>
                         <field name="type" select="1" on_change="onchange_server_type(type, is_ssl)"/>
                         <field name="date" select="1"/>
-                        <field name="attach"/>
-                        <field name="active" select="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Server &amp; Login">
-                            <group col="2" colspan="2">
+                            <group col="4" colspan="2">
                                 <separator string="Server Information" colspan="2"/>
-                                <field name="is_ssl" select="1" on_change="onchange_server_type(type, is_ssl)"/>
-                                <field name="server" />
+                                <field name="server" colspan="4"/>
                                 <field name="port" />
+                                <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"/>
@@ -46,24 +44,28 @@
                                 <field name="password" password="True" />
                             </group>
                             <group col="2" colspan="2">
-                                <separator string="Auto Reply?" colspan="2"/>
-                                <field name="action_id"/>
-                                <field name="user_id"/>
-                            </group>
-                            <group col="2" colspan="2">
-                                <separator string="Process Parameter" colspan="2"/>
+                                <separator string="Automated Processing" colspan="2"/>
                                 <field name="object_id"/>
-                                <field name="priority"/>
+                                <field name="action_id"/>
                             </group>
                             <separator string="Description" colspan="4"/>
                             <field name="note" colspan="4" nolabel="1"/>
                         </page>
+                        <page string="Advanced">
+                            <group colspan="2" col="2">
+                                <separator string="Advanced options" colspan="2"/>
+                                <field name="priority"/>
+                                <field name="attach"/>
+                                <field name="original"/>
+                                <field name="active" select="1"/>
+                            </group>
+                        </page>
                     </notebook>
                     <group col="6" colspan="4">
                         <field name="state" select="1"/>
                         <button string="Confirm" type="object" name="button_confirm_login" states="draft" icon="gtk-apply"/>
-                        <button string="Fetch Emails" type="object" name="button_fetch_mail" states="done"/>
-                        <button string="Set to Draft" type="object" name="set_draft" icon="gtk-convert"/>
+                        <button string="Fetch Now" type="object" name="fetch_mail" states="done"/>
+                        <button string="Reset Confirmation" type="object" name="set_draft" icon="gtk-convert" states="done"/>
                     </group>
                 </form>
             </field>
@@ -93,7 +95,7 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_email_server_tree">
-            <field name="name">Incomming Servers</field>
+            <field name="name">Incoming Mail Servers</field>
             <field name="res_model">email.server</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -102,47 +104,39 @@
         </record>
 
         <menuitem
-            parent="mail.menu_config_email"
+            parent="base.next_id_15"
             id="menu_action_fetchmail_server_tree"
             action="action_email_server_tree"
-            name="Incomming Servers"
+            name="Incoming Mail Servers"
+            sequence="40"
         />
 
       <record model="ir.ui.view" id="email_message_tree_view">
-	      <field name="name">mail.message.tree</field>
-	      <field name="model">mail.message</field>
-	      <field name="type">tree</field>
-	      <field name="inherit_id" ref="mail.view_email_message_tree"/>
-	      <field name="arch" type="xml">
-	          <field name="user_id" position="after">
-	              <field name="server_id" select="1"/>
-	          </field>
-	      </field>
+          <field name="name">mail.message.tree</field>
+          <field name="model">mail.message</field>
+          <field name="type">tree</field>
+          <field name="inherit_id" ref="mail.view_email_message_tree"/>
+          <field name="arch" type="xml">
+              <field name="user_id" position="after">
+                  <field name="server_id" select="1"/>
+              </field>
+          </field>
       </record>
 
       <record model="ir.ui.view" id="email_message_search_view">
-	      <field name="name">mail.message.inherit.search</field>
-	      <field name="model">mail.message</field>
-	      <field name="type">search</field>
-	      <field name="inherit_id" ref="mail.view_email_message_search"/>
-	      <field name="arch" type="xml">
-			<xpath expr="/search/group/filter[@string='Thread']" position="before">
+          <field name="name">mail.message.inherit.search</field>
+          <field name="model">mail.message</field>
+          <field name="type">search</field>
+          <field name="inherit_id" ref="mail.view_email_message_search"/>
+          <field name="arch" type="xml">
+            <xpath expr="/search/group/filter[@string='Thread']" position="before">
                 <filter string="Mail Server" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'server_id'}"/>
             </xpath>
-	      </field>
-      </record>
-
-      <record id="action_view_mail_message_emails" model="ir.actions.act_window">
-            <field name="name">Messages</field>
-            <field name="res_model">mail.message</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context">{'search_default_emails': 1}</field>
-            <field name="search_view_id" ref="email_message_search_view"/>
+          </field>
       </record>
 
       <act_window
-            context="{'search_default_server_id': [active_id], 'default_server_id': active_id}"
+            context="{'search_default_server_id': active_id, 'default_server_id': active_id}"
             id="act_server_history" name="Messages" domain="[('email_from', '!=', False), ('server_id', '=', active_id)]"
             res_model="mail.message" src_model="email.server"/>
 
-- 
cgit v1.2.3


From 32a892cbbba6345d0ae4a4cacbae117225463d72 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 8 Sep 2011 16:19:41 +0200
Subject: [IMP] fetchmail: cleanup - improve names

bzr revid: odo@openerp.com-20110908141941-vsd21wfb13z5tywa
---
 addons/fetchmail/fetchmail_view.xml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

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

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 5f5c094a454..f9c6b9b591a 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -3,8 +3,8 @@
     <data>
 
         <record model="ir.ui.view" id="view_email_server_tree">
-            <field name="name">email.server.tree</field>
-            <field name="model">email.server</field>
+            <field name="name">fetchmail.server.list</field>
+            <field name="model">fetchmail.server</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state in ('draft');" string="POP/IMAP Servers">
@@ -20,11 +20,11 @@
         </record>
 
         <record model="ir.ui.view" id="view_email_server_form">
-            <field name="name">email.server.form</field>
-            <field name="model">email.server</field>
+            <field name="name">fetchmail.server.form</field>
+            <field name="model">fetchmail.server</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="POP/IMAP Server">
+                <form string="Incoming Mail Server">
                     <group col="6" colspan="4">
                         <field name="name" select="1" colspan="4"/>
                         <field name="type" select="1" on_change="onchange_server_type(type, is_ssl)"/>
@@ -63,20 +63,20 @@
                     </notebook>
                     <group col="6" colspan="4">
                         <field name="state" select="1"/>
-                        <button string="Confirm" type="object" name="button_confirm_login" states="draft" icon="gtk-apply"/>
-                        <button string="Fetch Now" type="object" name="fetch_mail" states="done"/>
                         <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"/>
                     </group>
                 </form>
             </field>
         </record>
 
         <record model="ir.ui.view" id="view_email_server_search">
-            <field name="name">email.server.search</field>
-            <field name="model">email.server</field>
+            <field name="name">fetchmail.server.search</field>
+            <field name="model">fetchmail.server</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Email Servers">
+                <search string="Search Incoming Mail Servers">
                     <filter string="IMAP" icon="terp-folder-green" domain="[('type','=','imap')]" help="Server type IMAP."/>
                     <filter string="POP" icon="terp-folder-orange" domain="[('type','=','pop')]" help="Server type POP."/>
                     <separator orientation="vertical"/>
@@ -96,7 +96,7 @@
 
         <record model="ir.actions.act_window" id="action_email_server_tree">
             <field name="name">Incoming Mail Servers</field>
-            <field name="res_model">email.server</field>
+            <field name="res_model">fetchmail.server</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_email_server_tree"/>
@@ -112,13 +112,13 @@
         />
 
       <record model="ir.ui.view" id="email_message_tree_view">
-          <field name="name">mail.message.tree</field>
+          <field name="name">mail.message.list.fetchmail</field>
           <field name="model">mail.message</field>
           <field name="type">tree</field>
           <field name="inherit_id" ref="mail.view_email_message_tree"/>
           <field name="arch" type="xml">
               <field name="user_id" position="after">
-                  <field name="server_id" select="1"/>
+                  <field name="fetchmail_server_id" select="1"/>
               </field>
           </field>
       </record>
@@ -130,15 +130,15 @@
           <field name="inherit_id" ref="mail.view_email_message_search"/>
           <field name="arch" type="xml">
             <xpath expr="/search/group/filter[@string='Thread']" position="before">
-                <filter string="Mail Server" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'server_id'}"/>
+                <filter string="Mail Server" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'fetchmail_server_id'}"/>
             </xpath>
           </field>
       </record>
 
       <act_window
             context="{'search_default_server_id': active_id, 'default_server_id': active_id}"
-            id="act_server_history" name="Messages" domain="[('email_from', '!=', False), ('server_id', '=', active_id)]"
-            res_model="mail.message" src_model="email.server"/>
+            id="act_server_history" name="Messages" domain="[('email_from', '!=', False), ('fetchmail_server_id', '=', active_id)]"
+            res_model="mail.message" src_model="fetchmail.server"/>
 
     </data>
 </openerp>
-- 
cgit v1.2.3


From 178fec5c6410db05dd7b49f362454a49a4dd8b21 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Sun, 11 Sep 2011 15:50:25 +0200
Subject: [FIX] str 'in' str (singletons missing tuple-building comma), in
 @colors attributes. Replace by string equality

bzr revid: xmo@openerp.com-20110911135025-v9yct8pnjfj21tyj
---
 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 99f421ac4a5..364d9bbe47f 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -7,7 +7,7 @@
             <field name="model">email.server</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('waiting');gray:state in('done')" string="POP/IMAP Servers">
+                <tree colors="blue:state == 'draft';black:state == 'waiting';gray:state == 'done'" string="POP/IMAP Servers">
                     <field name="name"/>
                     <field name="type"/>
                     <field name="user"/>
-- 
cgit v1.2.3