From d2068b9bec1c46023aa25a45fe7c175d4516f125 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Tue, 26 Jun 2012 19:06:23 +0530
Subject: [IMP]knowledge : view are improved

bzr revid: hsa@tinyerp.com-20120626133623-5p17rdjrqaeim1o4
---
 addons/document_ftp/wizard/ftp_browse_view.xml        | 2 --
 addons/document_ftp/wizard/ftp_configuration_view.xml | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/document_ftp')

diff --git a/addons/document_ftp/wizard/ftp_browse_view.xml b/addons/document_ftp/wizard/ftp_browse_view.xml
index 8ed31ee2323..4aa86f77612 100644
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
@@ -9,9 +9,7 @@
                 <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"/>
                     </header>
-                    <separator string="Browse Document"/>
                     <group>
                         <field name="url" widget="url"/>
                     </group>
diff --git a/addons/document_ftp/wizard/ftp_configuration_view.xml b/addons/document_ftp/wizard/ftp_configuration_view.xml
index 10c8463b02c..e1a87b82358 100644
--- a/addons/document_ftp/wizard/ftp_configuration_view.xml
+++ b/addons/document_ftp/wizard/ftp_configuration_view.xml
@@ -20,7 +20,9 @@
             <group string="res_config_contents" position="replace">
             	<separator string="Configure FTP Server" />
             	<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>
+                    <field name="host"/>
+                </group>
             </group>
            <xpath expr="//button[@name='action_skip']" position="replace"/>
           </data>
-- 
cgit v1.2.3


From a930cc7b9d5072a3b449a87ff7a07c6192ff9967 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 29 Jun 2012 18:57:33 +0530
Subject: [IMP]set cancel button

bzr revid: dbr@tinyerp.com-20120629132733-uoq3hb3x85hs6ttf
---
 addons/document_ftp/wizard/ftp_browse_view.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/document_ftp')

diff --git a/addons/document_ftp/wizard/ftp_browse_view.xml b/addons/document_ftp/wizard/ftp_browse_view.xml
index a0656b5597d..6063fc3bdce 100644
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
@@ -9,6 +9,7 @@
                 <form string="Browse Document" version="7.0">
                     <header>
                         <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight"  />
+                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
-- 
cgit v1.2.3


From 10a2fb5b28ab02ffde83614ac55c1b84625f2119 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Wed, 4 Jul 2012 15:00:38 +0530
Subject: [IMP]remove extra cancel button

bzr revid: sgo@tinyerp.com-20120704093038-4jp02eg7pja0dd5z
---
 addons/document_ftp/wizard/ftp_browse_view.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'addons/document_ftp')

diff --git a/addons/document_ftp/wizard/ftp_browse_view.xml b/addons/document_ftp/wizard/ftp_browse_view.xml
index 6063fc3bdce..a0656b5597d 100644
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
@@ -9,7 +9,6 @@
                 <form string="Browse Document" version="7.0">
                     <header>
                         <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight"  />
-                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
-- 
cgit v1.2.3