From 0baea7eed3bb604cd3f3c9a8030f9a3827bdf645 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 22 Nov 2008 16:45:01 +0100
Subject: [PATCH] bugfixes

bzr revid: fp@tinyerp.com-20081122154501-zqe7gi1kwcj9qxhc
---
 .../wizard/base_module_publish.py             |  2 ++
 .../wizard/base_module_publish_all.py         |  8 +++++
 addons/document/document.py                   | 32 +++++++++++++------
 addons/document_ics/document_demo.xml         |  2 +-
 addons/event/event_demo.xml                   | 25 ---------------
 5 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/addons/base_module_publish/wizard/base_module_publish.py b/addons/base_module_publish/wizard/base_module_publish.py
index a2e36b60147..8743945c34d 100644
--- a/addons/base_module_publish/wizard/base_module_publish.py
+++ b/addons/base_module_publish/wizard/base_module_publish.py
@@ -264,8 +264,10 @@ def _upload(self, cr, uid, datas, context):
         'auto_password': datas['form']['password']
     }
     name = mod.name
+    print 'ICI'
     a = urllib.urlopen('http://www.openerp.com/mtree_interface.php?module=%s' % (name,))
     aa = a.read()
+    print aa
     if aa[0]<>'0':
         updata['link_id']=aa.split('\n')[0]
         updata['option'] = 'mtree'
diff --git a/addons/base_module_publish/wizard/base_module_publish_all.py b/addons/base_module_publish/wizard/base_module_publish_all.py
index 6816262534b..fc2e85a153c 100644
--- a/addons/base_module_publish/wizard/base_module_publish_all.py
+++ b/addons/base_module_publish/wizard/base_module_publish_all.py
@@ -101,6 +101,9 @@ def _upload(self, cr, uid, datas, context):
                 ], [('module', res['module_filename'],
                     res['module_file'])
                 ])
+        print '-'*50
+        print result
+        print '-'*50
         if result[0] == "1":
             raise wizard.except_wizard('Error', 'Login failed!')
         elif result[0] == "0":
@@ -126,13 +129,18 @@ def _upload(self, cr, uid, datas, context):
             'auto_login': datas['form']['login'],
             'auto_password': datas['form']['password']
         }
+        print updata
         a = urlopen('http://www.openerp.com/mtree_interface.php?module=%s' % (mod.name,))
         aa = a.read()
+        print '='*40
+        print aa
         if aa[0]<>'0':
             updata['link_id']=aa.split('\n')[0]
             updata['cat_id']=aa.split('\n')[1]
             updata['option'] = 'mtree'
         result = post_multipart('www.openerp.com', '/index.php', updata.items(), [])
+        print '.'*50
+        print result
     return {'update': '\n'.join(log[0]), 'already': '\n'.join(log[1]),
         'error': '\n'.join(log[2])}
 
diff --git a/addons/document/document.py b/addons/document/document.py
index 01ab5e96beb..a1bb5324a40 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -33,6 +33,17 @@ from content_index import content_index
 import netsvc
 import StringIO
 
+import random
+import string
+
+
+def random_name():
+    random.seed()
+    d = [random.choice(string.letters) for x in xrange(10) ]
+    name = "".join(d)
+    return name
+
+
 # Unsupported WebDAV Commands:
 #     label
 #     search
@@ -374,6 +385,8 @@ class document_directory(osv.osv):
 
 document_directory()
 
+print '1'
+
 class document_directory_node(osv.osv):
     _inherit = 'process.node'
     _columns = {
@@ -381,6 +394,8 @@ class document_directory_node(osv.osv):
     }
 document_directory_node()
 
+print '2'
+
 class document_directory_content_type(osv.osv):
     _name = 'document.directory.content.type'
     _description = 'Directory Content Type'
@@ -393,6 +408,7 @@ class document_directory_content_type(osv.osv):
         'active': lambda *args: 1
     }
 document_directory_content_type()
+print '3'
 
 class document_directory_content(osv.osv):
     _name = 'document.directory.content'
@@ -426,6 +442,7 @@ class document_directory_content(osv.osv):
         s.name = node
         return s
 document_directory_content()
+print '4'
 
 class ir_action_report_xml(osv.osv):
     _name="ir.actions.report.xml"
@@ -462,16 +479,7 @@ class ir_action_report_xml(osv.osv):
 
 ir_action_report_xml()
 
-
-import random
-import string
-
-
-def random_name():
-    random.seed()
-    d = [random.choice(string.letters) for x in xrange(10) ]
-    name = "".join(d)
-    return name
+print '5'
 
 
 def create_directory(path):
@@ -662,6 +670,8 @@ class document_file(osv.osv):
         return super(document_file, self).unlink(cr, uid, ids, context)
 document_file()
 
+print '5'
+
 class document_configuration_wizard(osv.osv_memory):
     _name='document.configuration.wizard'
     _rec_name = 'Auto Directory configuration'
@@ -759,3 +769,5 @@ class document_configuration_wizard(osv.osv_memory):
                 'target':'new',
         }
 document_configuration_wizard()
+
+print '6'
diff --git a/addons/document_ics/document_demo.xml b/addons/document_ics/document_demo.xml
index 72b1e60f0f8..eb939cfd515 100644
--- a/addons/document_ics/document_demo.xml
+++ b/addons/document_ics/document_demo.xml
@@ -18,7 +18,7 @@
         <field name="extension">.ics</field>
         <field name="include_name" eval="False"/>
         <field name="ics_object_id" ref="crm.model_crm_case"/>
-        <field name="ics_domain" eval="'[(\'section_id\',\'=\','+ref('section_meeting')+')]'"/>
+        <field name="ics_domain" eval="'[(\'section_id\',\'=\','+str(ref('section_meeting'))+')]'"/>
     </record>
 
     <record model="document.directory.ics.fields" id="dir_field1">
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index 94be31ea93d..ad25a1dbfc1 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -115,30 +115,5 @@
 		<field name="mail_confirm">Thanks for registrering. The conference will begin at 2 PM and will be given by Mister Pinckaers.</field>
 	</record>
 
-<!-- Demo data for Registration -->
-	<record id="event_registration_0" model="event.registration">
-		<field name="name">Registration for "Conference on Environment"</field>
-		<field name="partner_id" ref="base.res_partner_asus"/>
-		<field name="event_id" ref="event_2"/>
-		<field name="unit_price">15.50</field>
-		<field name="invoice_label">Ticket for Conference</field>
-	</record>
-	<record id="event_registration_1" model="event.registration">
-		<field name="name">Registration for "Opera of Verdi"</field>
-		<field name="partner_id" ref="base.res_partner_agrolait"/>
-		<field name="event_id" ref="event_1"/>
-		<field name="invoice_label">Ticket for Opera</field>
-		<field name="unit_price">24.00</field>
-		<field name="nb_register">5</field>
-	</record>
-	<record id="event_registration_2" model="event.registration">
-		<field name="name">Registration for "Concert of Bon Jovi"</field>
-		<field name="partner_id" ref="base.res_partner_c2c"/>
-		<field name="event_id" ref="event_0"/>
-		<field name="invoice_label">Ticket for Concert</field>
-		<field name="unit_price">68.00</field>
-		<field name="nb_register">2</field>
-	</record>
-
 	</data>
 </openerp>