openerp-dev-web team mailing list archive

Thread
Date

[Merge] lp:~openerp-dev/openobject-addons/atp-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1

To: mp+41456@xxxxxxxxxxxxxxxxxx,"Harry \(Open ERP\)" <hmo@xxxxxxxxxxx>
From: "atp\(OpenERP\)" <atp@xxxxxxxxxxx>
Date: Mon, 22 Nov 2010 12:58:34 -0000
Reply-to: mp+41456@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

atp(OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/atp-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  Harry (Open ERP) (hmo-tinyerp)
Related bugs:
  #669868 project_planning : Failed to search user, KeyError: 'parent_id'
  https://bugs.launchpad.net/bugs/669868
  #673899 caldav : Calendar Collections : Fields in 'groupby' must appear in the list of fields to read
  https://bugs.launchpad.net/bugs/673899
  #676858 [6.0RC1]  binary attachment of Partner1 can not be opened
  https://bugs.launchpad.net/bugs/676858


1)Fix Caldav synchronization Problem with sunbird and Evaluation.

-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/atp-dev-addons1/+merge/41456
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/atp-dev-addons1.

=== modified file 'caldav/caldav_data.xml'
--- caldav/caldav_data.xml	2010-11-22 10:30:29 +0000
+++ caldav/caldav_data.xml	2010-11-22 12:58:02 +0000
@@ -1,12 +1,8 @@
 <?xml version="1.0"?>
 <openerp>
     <data noupdate="1">
-        <record model="document.directory" id="document.dir_calendars">
-            <field name="name">Calendars</field>
-            <field name="calendar_collection">True</field>
-        </record>
+    
         <!--        Event attributes-->
-
         <record model="basic.calendar.attributes" id="field_event_comment">
             <field name="name">comment</field>
             <field name="type">vevent</field>

=== modified file 'caldav/caldav_setup.xml'
--- caldav/caldav_setup.xml	2010-11-22 09:45:27 +0000
+++ caldav/caldav_setup.xml	2010-11-22 12:58:02 +0000
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <!-- /calendars tree -->
-        <record id="document_directory_calendars0" model="document.directory">
+        <record id="document.dir_calendars" model="document.directory">
             <field name="domain">[]</field>
             <field eval="1" name="resource_find_all"/>
             <field eval="0" name="ressource_tree"/>
@@ -19,7 +19,7 @@
             <field eval="0" name="ressource_tree"/>
             <field name="user_id" eval="False"/>
             <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document_directory_calendars0"/>
+            <field model="document.directory" name="parent_id" ref="document.dir_calendars"/>
             <field name="type">directory</field>
             <field eval="[(6,0,[])]" name="group_ids"/>
             <field name="name">resources</field>
@@ -30,7 +30,7 @@
             <field eval="0" name="ressource_tree"/>
             <field name="user_id" eval="False"/>
             <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document_directory_calendars0"/>
+            <field model="document.directory" name="parent_id" ref="document.dir_calendars"/>
             <field name="type">ressource</field>
             <field name="ressource_type_id" ref="base.model_res_users"/>
             <field eval="[(6,0,[ref('base.group_system')])]" name="group_ids"/>
@@ -43,7 +43,7 @@
             <field name="user_id" eval="False"/>
             <field name="resource_field" ref="base.field_res_users_login"/>
             <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document_directory_calendars0"/>
+            <field model="document.directory" name="parent_id" ref="document.dir_calendars"/>
             <field name="storage_id" ref="document.storage_default"/>
             <field name="type">ressource</field>
             <field name="ressource_type_id" ref="base.model_res_users"/>
@@ -51,7 +51,7 @@
             <field name="name">users</field>
         </record>
         <record id="document_directory_dctx_0" model="document.directory.dctx">
-            <field model="document.directory" name="dir_id" ref="document_directory_users0"/>
+            <field model="document.directory" name="dir_id" ref="document.dir_calendars"/>
             <field name="field">user_id</field>
             <field name="expr">res_id</field>
         </record>
@@ -60,7 +60,7 @@
             <field eval="1" name="resource_find_all"/>
             <field name="user_id" eval="False"/>
             <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document_directory_users0"/>
+            <field model="document.directory" name="parent_id" ref="document.dir_calendars"/>
             <field name="storage_id" ref="document.storage_default"/>
             <field name="type">directory</field>
             <field eval="[(6,0,[])]" name="group_ids"/>
@@ -72,14 +72,14 @@
             <field eval="1" name="resource_find_all"/>
             <field eval="0" name="ressource_tree"/>
             <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document_directory_calendars0"/>
+            <field model="document.directory" name="parent_id" ref="document.dir_calendars"/>
             <field name="storage_id" ref="document.storage_default"/>
             <field name="type">directory</field>
             <field eval="[(6,0,[])]" name="group_ids"/>
             <field name="name">groups</field>
         </record>
         <record id="document_webdav_dir_property_calendarhomeset0" model="document.webdav.dir.property">
-            <field model="document.directory" name="dir_id" ref="document_directory_calendars0"/>
+            <field model="document.directory" name="dir_id" ref="document.dir_calendars"/>
             <field name="namespace">urn:ietf:params:xml:ns:caldav</field>
             <!-- no parent, it is a global property -->
             <field name="name">calendar-home-set</field>

=== modified file 'crm_caldav/crm_caldav_data.xml'
--- crm_caldav/crm_caldav_data.xml	2010-11-15 13:29:11 +0000
+++ crm_caldav/crm_caldav_data.xml	2010-11-22 12:58:02 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-	<data noupdate="1">
+    <data noupdate="1">
 
-	</data>
+    </data>
 </openerp>

=== modified file 'document/document_view.xml'
--- document/document_view.xml	2010-11-18 12:05:53 +0000
+++ document/document_view.xml	2010-11-22 12:58:02 +0000
@@ -106,7 +106,7 @@
                             <field name="extension"/>
                             <field name="include_name"/>
                             <separator string="PDF Report" colspan="4"/>
-                            <field name="report_id" domain="[('model_id','=',parent.ressource_type_id)]"/>
+                            <field name="report_id" domain="[ ('type','=','ressource'),('model_id','=',parent.ressource_type_id)]"/>
                         </form>
                         <tree string="Contents">
                             <field name="sequence" string="Seq."/>

=== modified file 'document_ftp/test/document_ftp_test4.yml'
--- document_ftp/test/document_ftp_test4.yml	2010-11-19 05:19:13 +0000
+++ document_ftp/test/document_ftp_test4.yml	2010-11-22 12:58:02 +0000
@@ -155,7 +155,6 @@
         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()        
     

=== modified file 'document_ics/document_data.xml'
--- document_ics/document_data.xml	2009-12-02 05:45:55 +0000
+++ document_ics/document_data.xml	2010-11-22 12:58:02 +0000
@@ -9,18 +9,4 @@
     </record>
 </data>
 
-	
-  <data noupdate="1">      
-      <record id="seq_type_crm_case_code" model="ir.sequence.type">
-          <field name="name">CRM Case Code</field>
-          <field name="code">crm.case</field>
-      </record>
-      <record id="seq_sale_order" model="ir.sequence">
-          <field name="name">CRM Case</field>
-          <field name="code">crm.case</field>
-          <field name="prefix">CASE</field>
-          <field name="padding">3</field>
-      </record>
-  </data>
-    
 </openerp>

=== modified file 'document_ics/document_demo.xml'
--- document_ics/document_demo.xml	2010-11-16 10:06:01 +0000
+++ document_ics/document_demo.xml	2010-11-22 12:58:02 +0000
@@ -5,13 +5,14 @@
     <record model="crm.case.section" id="section_meeting">
         <field name="name">Shared Calendar Meetings</field>
         <field name="code">shcal</field>
-    </record>
-
+    </record> 
+    
     <record model="document.directory.content" id="dir_content_calendar">
         <field name="name">Calendars</field>
         <field name="suffix">meetings</field>
         <field name="extension">.ics</field>
         <field name="include_name" eval="False"/>
+        <field name="directory_id" ref="document.dir_calendars"/>
         <field name="object_id" ref="crm.model_crm_meeting"/>
         <field name="ics_domain" eval="'[]'"/>
     </record>

=== modified file 'project_caldav/project_caldav_data.xml'
--- project_caldav/project_caldav_data.xml	2010-11-15 13:29:11 +0000
+++ project_caldav/project_caldav_data.xml	2010-11-22 12:58:02 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
-	<data noupdate="1">       
-
-	
-	</data>
+    <data noupdate="1">       
+
+
+    </data>
 </openerp>

Follow ups

[Merge] lp:~openerp-dev/openobject-addons/atp-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1
From: Harry (Open ERP), 2010-11-23