From 3611f431b93e4bed0bfb8d360dc19cb2aa52778b Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 14 Jun 2012 11:34:50 +0530
Subject: [IMP]document: remove warning

bzr revid: kjo@tinyerp.com-20120614060450-w8771020su128gmg
---
 addons/document_ftp/ftpserver/__init__.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'addons/document_ftp')

diff --git a/addons/document_ftp/ftpserver/__init__.py b/addons/document_ftp/ftpserver/__init__.py
index 2e09a938a05..c9f735cdd9e 100644
--- a/addons/document_ftp/ftpserver/__init__.py
+++ b/addons/document_ftp/ftpserver/__init__.py
@@ -23,7 +23,7 @@ import threading
 import ftpserver
 import authorizer
 import abstracted_fs
-import netsvc
+import logging
 from tools import config
 
 def start_server():
@@ -35,9 +35,6 @@ def start_server():
         PASSIVE_PORTS = int(pps[0]), int(pps[1])
 
     class ftp_server(threading.Thread):
-        def log(self, level, message):
-            logger = netsvc.Logger()
-            logger.notifyChannel('FTP', level, message)
 
         def run(self):
             autho = authorizer.authorizer()
@@ -48,17 +45,17 @@ def start_server():
             if PASSIVE_PORTS:
                 ftpserver.FTPHandler.passive_ports = PASSIVE_PORTS
 
-            ftpserver.log = lambda msg: self.log(netsvc.LOG_INFO, msg)
+            ftpserver.log = lambda msg: logging.getLogger('document.ftp').info(msg)
             ftpserver.logline = lambda msg: None
-            ftpserver.logerror = lambda msg: self.log(netsvc.LOG_ERROR, msg)
+            ftpserver.logerror = lambda msg: logging.getLogger('document.ftp').error(msg)
 
             ftpd = ftpserver.FTPServer((HOST, PORT), ftpserver.FTPHandler)
             ftpd.serve_forever()
 
     if HOST.lower() == 'none':
-        netsvc.Logger().notifyChannel("FTP", netsvc.LOG_INFO, "\n Server FTP Not Started\n")
+        logging.getLogger('document.ftp').info("\n Server FTP Not Started\n")
     else:
-        netsvc.Logger().notifyChannel("FTP", netsvc.LOG_INFO, "\n Serving FTP on %s:%s\n" % (HOST, PORT))
+        logging.getLogger('document.ftp').info("\n Serving FTP on %s:%s\n" % (HOST, PORT))
         ds = ftp_server()
         ds.daemon = True
         ds.start()
-- 
cgit v1.2.3


From 25bcae09f8b6a6c1c0593895e7310d3e38a81105 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Mon, 18 Jun 2012 18:15:11 +0530
Subject: [REM] : Remove cancel button from wizard

bzr revid: aja@tinyerp.com-20120618124511-362td1pd82io8sxr
---
 addons/document_ftp/wizard/ftp_browse_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 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..af8e9cd48b5 100644
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
@@ -8,8 +8,7 @@
             <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_form_button_active_flow"/>
                     </header>
                     <separator string="Browse Document"/>
                     <group>
-- 
cgit v1.2.3


From 660cc67256df5caeffd208c3c1a5efabcb637a05 Mon Sep 17 00:00:00 2001
From: "Twinkle (OpenERP)" <tch@tinyerp.com>
Date: Wed, 20 Jun 2012 16:19:23 +0530
Subject: [IMP]Added highlight button on wizard

bzr revid: tch@tinyerp.com-20120620104923-z1hty740vn160fg9
---
 addons/document_ftp/wizard/ftp_browse_view.xml | 2 +-
 1 file changed, 1 insertion(+), 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 af8e9cd48b5..2bbdb02291b 100644
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Browse Document" version="7.0">
                     <header>
-                        <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                        <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <separator string="Browse Document"/>
                     <group>
-- 
cgit v1.2.3


From 0c374a66bc3de5cdf48eb66b2078c0946aa045db Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Fri, 22 Jun 2012 12:18:39 +0530
Subject: [IMP] Add logging at the top of python files

bzr revid: fka@tinyerp.com-20120622064839-llitm8szgikxznwr
---
 addons/document_ftp/ftpserver/__init__.py      | 12 ++++++------
 addons/document_ftp/ftpserver/abstracted_fs.py |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'addons/document_ftp')

diff --git a/addons/document_ftp/ftpserver/__init__.py b/addons/document_ftp/ftpserver/__init__.py
index c9f735cdd9e..582972b9c4d 100644
--- a/addons/document_ftp/ftpserver/__init__.py
+++ b/addons/document_ftp/ftpserver/__init__.py
@@ -25,7 +25,7 @@ import authorizer
 import abstracted_fs
 import logging
 from tools import config
-
+_logger = logging.getLogger(__name__)
 def start_server():
     HOST = config.get('ftp_server_host', '127.0.0.1')
     PORT = int(config.get('ftp_server_port', '8021'))
@@ -35,7 +35,7 @@ def start_server():
         PASSIVE_PORTS = int(pps[0]), int(pps[1])
 
     class ftp_server(threading.Thread):
-
+        
         def run(self):
             autho = authorizer.authorizer()
             ftpserver.FTPHandler.authorizer = autho
@@ -45,17 +45,17 @@ def start_server():
             if PASSIVE_PORTS:
                 ftpserver.FTPHandler.passive_ports = PASSIVE_PORTS
 
-            ftpserver.log = lambda msg: logging.getLogger('document.ftp').info(msg)
+            ftpserver.log = lambda msg: _logger.info(msg)
             ftpserver.logline = lambda msg: None
-            ftpserver.logerror = lambda msg: logging.getLogger('document.ftp').error(msg)
+            ftpserver.logerror = lambda msg: self.logger.error(msg)
 
             ftpd = ftpserver.FTPServer((HOST, PORT), ftpserver.FTPHandler)
             ftpd.serve_forever()
 
     if HOST.lower() == 'none':
-        logging.getLogger('document.ftp').info("\n Server FTP Not Started\n")
+        _logger.info("\n Server FTP Not Started\n")
     else:
-        logging.getLogger('document.ftp').info("\n Serving FTP on %s:%s\n" % (HOST, PORT))
+        _logger.info("\n Serving FTP on %s:%s\n" % (HOST, PORT))
         ds = ftp_server()
         ds.daemon = True
         ds.start()
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index 83cd1cde725..429016a2376 100644
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -56,7 +56,7 @@ class abstracted_fs(object):
         self.cwd = '/'
         self.cwd_node = None
         self.rnfr = None
-        self._log = logging.getLogger('FTP.fs')
+        self._log = logging.getLogger(__name__)
 
     # Ok
     def db_list(self):
-- 
cgit v1.2.3


From 93b17b18540aaa2ebb33e2b89f0057c331d96671 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Mon, 25 Jun 2012 10:52:04 +0530
Subject: [IMP/FIX] Imporved the Knoledge wizard no label issue and removed the
 action_skip button

bzr revid: jam@tinyerp.com-20120625052204-ge7533h5n6wand0j
---
 addons/document_ftp/wizard/ftp_configuration_view.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'addons/document_ftp')

diff --git a/addons/document_ftp/wizard/ftp_configuration_view.xml b/addons/document_ftp/wizard/ftp_configuration_view.xml
index 10c8463b02c..7787fcfb834 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>
-- 
cgit v1.2.3


From 0e97cefe9e8247cac86a1c8342fb4f21ff8cb016 Mon Sep 17 00:00:00 2001
From: "Twinkle (OpenERP)" <tch@tinyerp.com>
Date: Mon, 25 Jun 2012 15:39:01 +0530
Subject: [IMP]Improve wizard button

bzr revid: tch@tinyerp.com-20120625100901-ucjbttxod55erqmf
---
 addons/document_ftp/wizard/ftp_browse_view.xml | 2 +-
 1 file changed, 1 insertion(+), 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 2bbdb02291b..5189fdabacf 100644
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Browse Document" version="7.0">
                     <header>
-                        <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight"/>
+                        <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </header>
                     <separator string="Browse Document"/>
                     <group>
-- 
cgit v1.2.3


From 471037495c7572c0b1aac2b069a67a7c0e1f56f5 Mon Sep 17 00:00:00 2001
From: "Twinkle (OpenERP)" <tch@tinyerp.com>
Date: Tue, 26 Jun 2012 12:01:19 +0530
Subject: [IMP]Apply css class flow on wizards buttons

bzr revid: tch@tinyerp.com-20120626063119-5i93di16milljxap
---
 addons/document_ftp/wizard/ftp_browse_view.xml | 2 +-
 1 file changed, 1 insertion(+), 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 5189fdabacf..b3d34fcbff7 100644
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Browse Document" version="7.0">
                     <header>
-                        <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight_editable" />
+                        <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </header>
                     <separator string="Browse Document"/>
                     <group>
-- 
cgit v1.2.3


From c180a7f941b503b9a06a8dad8a6c117374775b25 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 26 Jun 2012 22:19:46 +0200
Subject: [FIX] revert ir_values on document

bzr revid: al@openerp.com-20120626201946-44c5odspvbttqyv1
---
 addons/document_ftp/ftpserver/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/document_ftp')

diff --git a/addons/document_ftp/ftpserver/__init__.py b/addons/document_ftp/ftpserver/__init__.py
index 582972b9c4d..59aff85c633 100644
--- a/addons/document_ftp/ftpserver/__init__.py
+++ b/addons/document_ftp/ftpserver/__init__.py
@@ -47,7 +47,7 @@ def start_server():
 
             ftpserver.log = lambda msg: _logger.info(msg)
             ftpserver.logline = lambda msg: None
-            ftpserver.logerror = lambda msg: self.logger.error(msg)
+            ftpserver.logerror = lambda msg: _logger.error(msg)
 
             ftpd = ftpserver.FTPServer((HOST, PORT), ftpserver.FTPHandler)
             ftpd.serve_forever()
-- 
cgit v1.2.3


From 8be3b211fdec3875e8e213eeac5528af1c78a5c5 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Wed, 27 Jun 2012 18:34:32 +0530
Subject: [FIX] Added cancel button and removed the icons

bzr revid: jam@tinyerp.com-20120627130432-s5c78dmjnpdhucld
---
 addons/document_ftp/wizard/ftp_browse_view.xml | 2 ++
 1 file changed, 2 insertions(+)

(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 b3d34fcbff7..ea3d792f271 100644
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
@@ -9,6 +9,8 @@
                 <form string="Browse Document" version="7.0">
                     <header>
                         <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <separator string="Browse Document"/>
                     <group>
-- 
cgit v1.2.3


From 1702b2335d7febda80f38846cec386053c0e41a0 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 28 Jun 2012 12:10:05 +0530
Subject: [IMP]remove tabs and add spaces instead of them

bzr revid: sgo@tinyerp.com-20120628064005-zuerrpazumf5lf1q
---
 addons/document_ftp/wizard/ftp_configuration_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/document_ftp')

diff --git a/addons/document_ftp/wizard/ftp_configuration_view.xml b/addons/document_ftp/wizard/ftp_configuration_view.xml
index 10c8463b02c..c4140e4511d 100644
--- a/addons/document_ftp/wizard/ftp_configuration_view.xml
+++ b/addons/document_ftp/wizard/ftp_configuration_view.xml
@@ -18,8 +18,8 @@
               <attribute name="string">Knowledge Application Configuration</attribute>
             </form>
             <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.."/>
+                <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>
            <xpath expr="//button[@name='action_skip']" position="replace"/>
-- 
cgit v1.2.3


From 5133bee1d529722cd690188d61d51debd2d91968 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 29 Jun 2012 10:30:24 +0200
Subject: [FIX] in form views, replace class 'oe_highlight_on_dirty' by
 'oe_highlight'

bzr revid: rco@openerp.com-20120629083024-rqhtbf9melkygg0m
---
 addons/document_ftp/wizard/ftp_browse_view.xml | 2 +-
 1 file changed, 1 insertion(+), 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 ea3d792f271..e2e1825f522 100644
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Browse Document" version="7.0">
                     <header>
-                        <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                        <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight"  />
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
-- 
cgit v1.2.3