diff options
| author | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-06-29 14:36:18 +0200 |
|---|---|---|
| committer | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-06-29 14:36:18 +0200 |
| commit | 6fe94bd4bc076ad659dffe453c7b057e9340b54d (patch) | |
| tree | d673f7a2b25ec1f01307c45f081ed8c9fe27babf /addons/document_ftp/wizard | |
| parent | a642b36339ac6628b1a937bbf0d2750cc14fcdd5 (diff) | |
| parent | 37601079a987b0b20f22fff8963d22b1440b78b4 (diff) | |
[MERGE] merged with maint runk
bzr revid: qdp-launchpad@openerp.com-20120629123618-z1bv3dqdfqy23hno
Diffstat (limited to 'addons/document_ftp/wizard')
| -rw-r--r-- | addons/document_ftp/wizard/ftp_browse_view.xml | 5 | ||||
| -rw-r--r-- | addons/document_ftp/wizard/ftp_configuration_view.xml | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/addons/document_ftp/wizard/ftp_browse_view.xml b/addons/document_ftp/wizard/ftp_browse_view.xml index 8ed31ee2323..e2e1825f522 100644 --- a/addons/document_ftp/wizard/ftp_browse_view.xml +++ b/addons/document_ftp/wizard/ftp_browse_view.xml @@ -8,8 +8,9 @@ <field name="arch" type="xml"> <form string="Browse Document" version="7.0"> <header> - <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok"/> - <button special="cancel" string="_Cancel" icon="gtk-cancel"/> + <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight" /> + or + <button string="Cancel" class="oe_link" special="cancel" /> </header> <separator string="Browse Document"/> <group> diff --git a/addons/document_ftp/wizard/ftp_configuration_view.xml b/addons/document_ftp/wizard/ftp_configuration_view.xml index c4140e4511d..ed52a730023 100644 --- a/addons/document_ftp/wizard/ftp_configuration_view.xml +++ b/addons/document_ftp/wizard/ftp_configuration_view.xml @@ -22,7 +22,6 @@ <label string="Indicate the network address on which your OpenERP server should be reachable for end-users. This depends on your network topology and configuration, and will only affect the links displayed to the users. The format is HOST:PORT and the default host (localhost) is only suitable for access from the server machine itself.."/> <field name="host"/> </group> - <xpath expr="//button[@name='action_skip']" position="replace"/> </data> </field> </record> |