odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] remove warnings, better view for mails 

bzr revid: fp@tinyerp.com-20111001195103-sd8y0n4t8snzju9o
This commit is contained in:
Fabien Pinckaers 2011-10-01 21:51:03 +02:00
parent 26c6e4440b
commit c8a29501e4
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
openerp/addons/base/ir/ir.xml
View File

@ -2010,23 +2010,19 @@
<field name="name"/>
<field name="sequence"/>
</group>
<notebook colspan="4">
<page string="Configuration">
<group col="2" colspan="4">
<separator string="Connection Information" colspan="4"/>
<field name="smtp_host"/>
<field name="smtp_port"/>
<field name="smtp_debug"/>
</group>
<group col="2" colspan="4">
<separator string="Security and Authentication" colspan="2"/>
<field name="smtp_encryption" on_change="on_change_encryption(smtp_encryption)"/>
<field name="smtp_user"/>
<field name="smtp_pass" password="True"/>
<button name="test_smtp_connection" type="object" string="Test Connection" icon="gtk-network" colspan="2"/>
</group>
</page>
</notebook>
<group col="2" colspan="4">
<separator string="Connection Information" colspan="4"/>
<field name="smtp_host"/>
<field name="smtp_port"/>
<field name="smtp_debug" groups="base.group_extended"/>
</group>
<group col="2" colspan="4">
<separator string="Security and Authentication" colspan="2"/>
<field name="smtp_encryption" on_change="on_change_encryption(smtp_encryption)"/>
<field name="smtp_user"/>
<field name="smtp_pass" password="True"/>
<button name="test_smtp_connection" type="object" string="Test Connection" icon="gtk-network" colspan="2"/>
</group>
</form>
</field>
</record>

2
openerp/addons/base/res/res_partner.py
View File

@ -229,7 +229,7 @@ class res_partner(osv.osv):
def address_get(self, cr, uid, ids, adr_pref=['default']):
address_obj = self.pool.get('res.partner.address')
address_ids = address_obj.search(cr, uid, [('partner_id', '=', ids)])
address_ids = address_obj.search(cr, uid, [('partner_id', 'in', ids)])
address_rec = address_obj.read(cr, uid, address_ids, ['type'])
res = list(tuple(addr.values()) for addr in address_rec)
adr = dict(res)