pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REMOVE] no attachement in note

Browse Source 
bzr revid: tfr@openerp.com-20110208171430-rho6bmj9h93w62b0
This commit is contained in:
Thibault Francois
2011-02-08 18:14:30 +01:00
parent 6ca06b7027
commit df43d8939c
2 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/wizard/crm_add_note_view.xml
+3 -18
View File
@@ -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" />
addons/crm/wizard/crm_lead_to_opportunity.py
+1 -2
View File
@@ -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: