diff options
| author | Stephane Wirtel <stw@openerp.com> | 2011-10-03 15:22:44 +0200 |
|---|---|---|
| committer | Stephane Wirtel <stw@openerp.com> | 2011-10-03 15:22:44 +0200 |
| commit | 2810a6ce4aeeeca885bce7ec4ef2124839cfac62 (patch) | |
| tree | eabc8b6d86e9405139062e6f0050c90f4c4b67a3 /addons/fetchmail/fetchmail_view.xml | |
| parent | d57135eaefa4ff9bc0e9c80838a2a3b163e92f4b (diff) | |
| parent | 56c5b496baee8455e349695fa0361d33bdc2ccfe (diff) | |
[MERGE] Upstream
bzr revid: stw@openerp.com-20111003132244-7yum8h21osi9zfcu
Diffstat (limited to 'addons/fetchmail/fetchmail_view.xml')
| -rw-r--r-- | addons/fetchmail/fetchmail_view.xml | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml index ceb28284a6c..16e86112afd 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> @@ -45,9 +45,9 @@ <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"/> @@ -59,10 +59,10 @@ <field name="archive" filename="archive_filename" /> </group> </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"/> + <field name="priority" groups="base.group_extended"/> <field name="attach"/> <field name="original"/> <field name="active" select="1"/> @@ -70,7 +70,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 & 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"/> @@ -91,13 +91,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> |