From 9d8d8110d787958b205f5f85b213452b2f462092 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Thu, 18 Nov 2010 20:50:52 +0530
Subject: [PATCH 1/3] [FIX]: Remove dir and File from yaml of document_ftp
 module.

bzr revid: atp@tinyerp.co.in-20101118152052-76bumjsycl9vk2o7
---
 .../document_ftp/test/document_ftp_test2.yml  | 13 ++++++++
 .../document_ftp/test/document_ftp_test4.yml  | 31 +++++++++++++++++--
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/addons/document_ftp/test/document_ftp_test2.yml b/addons/document_ftp/test/document_ftp_test2.yml
index 5da4bcd83ef..872456e7191 100644
--- a/addons/document_ftp/test/document_ftp_test2.yml
+++ b/addons/document_ftp/test/document_ftp_test2.yml
@@ -271,6 +271,19 @@
         for i in range(0, 200):
             ftp.delete('test-name%s.txt' %i)
         ftp.close()
+ 
+-
+    I delete the "test.txt" and "test-renamed.txt" file        
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        from cStringIO import StringIO
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
+        # TODO speed
+        ftp.delete('test.txt')
+        ftp.delete('test-renamed.txt')
+        ftp.close()  
+              
 -
     I remove the 'Test-Folder2'
 -
diff --git a/addons/document_ftp/test/document_ftp_test4.yml b/addons/document_ftp/test/document_ftp_test4.yml
index 2441be3bf92..f92e4c04857 100644
--- a/addons/document_ftp/test/document_ftp_test4.yml
+++ b/addons/document_ftp/test/document_ftp_test4.yml
@@ -82,7 +82,7 @@
 -
     I create an ir.attachment, attached (not related) to Partner1
 -
-    !record {model: ir.attachment, id: file_test1 }:
+    !record {model: ir.attachment, id: file_test1}:
         name: File of pat1
         res_model: res.partner
         res_id:  !eval ref("tpartner1")
@@ -147,10 +147,35 @@
 - |
     Bonus Piste:
     I create a 'Partner3' under 'all'
+    
 -
-    I delete the Partners Testing folder
+   I delete "pat1-dynamic.txt" File.
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        from cStringIO import StringIO
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Partners Testing/Pat 1/Partners of Test/Partner 1')
+        # TODO speed
+        ftp.delete('pat1-dynamic.txt')
+        ftp.close()        
+    
+-
+    I delete the Partners Testing folder,  "File of pat1" file, Partner and Partner category.
 -
     !python {model: document.directory}: |
+        attach_pool = self.pool.get('ir.attachment')
+        partner_categ_pool = self.pool.get('res.partner.category')
+        partner_pool =  self.pool.get('res.partner')
+        
+        attach_ids = attach_pool.search(cr, uid, [('name','=','File of pat1')]) 
+        attach_pool.unlink(cr, uid, attach_ids)
         self.unlink(cr, uid, [ref('dir_tests2')])
         self.unlink(cr, uid, [ref('dir_respart1')])
-        cr.commit()
\ No newline at end of file
+        attach_pool.unlink(cr, uid, [ref('file_test1')])
+        partner_categ_pool.unlink(cr, uid, [ref('tpat_categ_none')])
+        partner_categ_pool.unlink(cr, uid, [ref('tpat_categ_pat1')])
+        partner_categ_pool.unlink(cr, uid, [ref('tpat_categ_all')])
+        partner_pool.unlink(cr, uid, [ref('tpartner1')])
+        partner_pool.unlink(cr, uid, [ref('tpartner_2')])
+        cr.commit()    
+    

From e2345c2cff1dbdba2aa6b185496286cfc5055ca0 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Fri, 19 Nov 2010 10:49:13 +0530
Subject: [PATCH 2/3] [IMP]: Minor Improvement in document_ftp yaml.

bzr revid: atp@tinyerp.co.in-20101119051913-02kbtpc3862qh2zw
---
 addons/document_ftp/test/document_ftp_test4.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/document_ftp/test/document_ftp_test4.yml b/addons/document_ftp/test/document_ftp_test4.yml
index f92e4c04857..4865d36c624 100644
--- a/addons/document_ftp/test/document_ftp_test4.yml
+++ b/addons/document_ftp/test/document_ftp_test4.yml
@@ -167,8 +167,6 @@
         partner_categ_pool = self.pool.get('res.partner.category')
         partner_pool =  self.pool.get('res.partner')
         
-        attach_ids = attach_pool.search(cr, uid, [('name','=','File of pat1')]) 
-        attach_pool.unlink(cr, uid, attach_ids)
         self.unlink(cr, uid, [ref('dir_tests2')])
         self.unlink(cr, uid, [ref('dir_respart1')])
         attach_pool.unlink(cr, uid, [ref('file_test1')])

From b3d30e78abfc55c227a45cbbc31b821fa028bda3 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Fri, 19 Nov 2010 12:32:54 +0530
Subject: [PATCH 3/3] [IMP]: Generated file view in document_ics module.

bzr revid: atp@tinyerp.co.in-20101119070254-oesvjdxblami3u80
---
 addons/document_ics/document_view.xml | 29 +++++++++++++++------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/addons/document_ics/document_view.xml b/addons/document_ics/document_view.xml
index 40174612539..e15d5edc5a5 100644
--- a/addons/document_ics/document_view.xml
+++ b/addons/document_ics/document_view.xml
@@ -17,25 +17,28 @@
         </field>
     </record>
 
-    <record model="ir.ui.view" id="view_document_directory_form">
+   <record model="ir.ui.view" id="view_document_directory_form">
         <field name="name">document.directory</field>
         <field name="model">document.directory</field>
         <field name="type">form</field>
         <field name="inherit_id" ref="view_document_directory_form_1"/>
         <field name="arch" type="xml">
             <field name="report_id" position="replace">
-                <field name="report_id" domain="[('type', '=', 'ressource'),('model_id','=',parent.ressource_type_id)]"/>
-                <separator string="ICS Calendar" colspan="4"/>
-                <field name="ics_domain"/>
-                <field name="ics_field_ids" colspan="4">
-                    <tree string="ICS Mapping" editable="bottom">
-                        <field name="name"/>
-                        <field name="fn" />
-                        <field name="field_id" domain="[('model_id','=?',parent.object_id)]"/>
-                        <field name="expr" />
-                    </tree>
-                </field>
-            </field>
+               <field name="report_id" 
+                            attrs="{'invisible': [('extension','=','.ics')] }"/>
+                <group colspan="4" col="4" attrs="{'invisible': [('extension','!=','.ics')]}">
+                    <separator string="ICS Calendar" colspan="4"/>
+                    <field name="ics_domain"/>
+                    <field name="ics_field_ids" colspan="4">
+                        <tree string="ICS Mapping" editable="bottom">
+                            <field name="name"/>
+                            <field name="fn" />
+                            <field name="field_id" domain="[('model_id','=?',parent.object_id)]"/>
+                            <field name="expr" />
+                        </tree>
+                    </field>
+                </group>
+             </field>       
         </field>
     </record>