[MERGE] merged knowlegde improvement work

bzr revid: hmo@tinyerp.com-20101005102518-nh0vy7d6mz0dmoc1

addons/document/document.py

@@ -255,10 +255,11 @@ class document_file(osv.osv):
                     storage_id = par.storage_id
                     break
                 par = par.parent_id
-            assert storage_id, "Strange, found file #%s w/o storage!" % f.id
-            r = stor.prepare_unlink(cr, uid, storage_id, f)
-            if r:
-                unres.append(r)
+            #assert storage_id, "Strange, found file #%s w/o storage!" % f.id #TOCHECK: after run yml, it's fail
+            if storage_id:
+                r = stor.prepare_unlink(cr, uid, storage_id, f)
+                if r:
+                    unres.append(r)
         res = super(document_file, self).unlink(cr, uid, ids, context)
         stor.do_unlink(cr, uid, unres)
         return res

addons/document_ftp/test_easyftp.py

@@ -31,7 +31,7 @@ def get_plain_ftp(timeout=10.0):
     ftp = FTP()
     host = config.get('ftp_server_host', '127.0.0.1')
     port = config.get('ftp_server_port', '8021')
-    ftp.connect(host, port, timeout=timeout)
+    ftp.connect(host, port,timeout)
     return ftp
 
 def get_ftp_login(cr, uid, ormobj):

addons/document_ftp/wizard/ftp_configuration_view.xml

@@ -21,7 +21,7 @@
             	<attribute name="string">Configure FTP Server</attribute>
           	</separator>
           	<xpath expr="//label[@string='description']" position="attributes">
-            <attribute name="string">Choose the address for the Document Management System's FTP server.</attribute>
+            <attribute name="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..</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
   				<attribute name='rowspan'>12</attribute>

addons/knowledge/installer.py

@@ -38,7 +38,7 @@ class knowledge_installer(osv.osv_memory):
             help="Lets you create wiki pages and page groups in order "
                  "to keep track of business knowledge and share it with "
                  "and  between your employees."),
-        # Templates of Content
+        # Content templates
         'wiki_faq':fields.boolean('Internal FAQ',
             help="Creates a skeleton internal FAQ pre-filled with "
                  "documentation about OpenERP's Document Management "

addons/knowledge/knowledge_installer.xml

@@ -27,7 +27,7 @@
             <field name="document_ftp"/>
             <field name="document_webdav"/>
             <field name="wiki"/>
-            <separator string="Templates of Content" colspan="4"/>
+            <separator string="Content templates" colspan="4"/>
             <field name="wiki_faq"/>
             <field name="wiki_quality_manual"/>
           </group>