From df43d8939c4d0cd6d4bc0ca9f489fd2b8602b186 Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Tue, 8 Feb 2011 18:14:30 +0100
Subject: [PATCH] [REMOVE] no attachement in note

bzr revid: tfr@openerp.com-20110208171430-rho6bmj9h93w62b0
---
 addons/crm/wizard/crm_add_note_view.xml      | 21 +++-----------------
 addons/crm/wizard/crm_lead_to_opportunity.py |  3 +--
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/addons/crm/wizard/crm_add_note_view.xml b/addons/crm/wizard/crm_add_note_view.xml
index f218a4252c1..7e8d23fd40d 100644
--- a/addons/crm/wizard/crm_add_note_view.xml
+++ b/addons/crm/wizard/crm_add_note_view.xml
@@ -9,24 +9,9 @@
             <field name="model">crm.add.note</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Add Note" col="4">
-                    <separator string="Add Note" colspan="6"/>
-                    <notebook colspan="6">
-                        <page string="Note">
-                            <field name="body" nolabel="1" colspan="4" default_focus="1"/>
-                        </page>
-                        <page string="Attachments">
-                            <field name="attachment_ids" colspan="4" nolabel="1">
-                                <form string="Attachment">
-                                    <field name="binary" filename="name" />
-                                    <field name="name" />
-                                </form>
-                                <tree string="Attachments">
-                                    <field name="name" />
-                                </tree>
-                            </field>
-                        </page>
-                    </notebook>
+                <form string="Add Note">
+                    <separator string="Add Note" colspan="4" />
+                    <field name="body" nolabel="1" colspan="4" default_focus="1"/>
                     <separator string="" colspan="6"/>
                     <group colspan="6" col="4" >
                         <field name="state" />
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 601b5fe4ff0..13e187fa8de 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -49,8 +49,7 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         res = super(crm_lead2opportunity_partner, self).default_get(cr, uid, fields, context=context)
         opportunities = res.get('opportunity_ids') or []
         name = 'convert'
-        if res.get('partner_id'):
-            
+        if res.get('partner_id'):            
             partner_id = res.get('partner_id')
             ids = lead_obj.search(cr, uid, [('partner_id', '=', partner_id), ('type', '=', 'opportunity')])
             if ids: