[FIX] remove warnings, better view for mails
bzr revid: fp@tinyerp.com-20111001195103-sd8y0n4t8snzju9o
This commit is contained in:
parent
26c6e4440b
commit
c8a29501e4
|
@ -2010,23 +2010,19 @@
|
||||||
<field name="name"/>
|
<field name="name"/>
|
||||||
<field name="sequence"/>
|
<field name="sequence"/>
|
||||||
</group>
|
</group>
|
||||||
<notebook colspan="4">
|
<group col="2" colspan="4">
|
||||||
<page string="Configuration">
|
<separator string="Connection Information" colspan="4"/>
|
||||||
<group col="2" colspan="4">
|
<field name="smtp_host"/>
|
||||||
<separator string="Connection Information" colspan="4"/>
|
<field name="smtp_port"/>
|
||||||
<field name="smtp_host"/>
|
<field name="smtp_debug" groups="base.group_extended"/>
|
||||||
<field name="smtp_port"/>
|
</group>
|
||||||
<field name="smtp_debug"/>
|
<group col="2" colspan="4">
|
||||||
</group>
|
<separator string="Security and Authentication" colspan="2"/>
|
||||||
<group col="2" colspan="4">
|
<field name="smtp_encryption" on_change="on_change_encryption(smtp_encryption)"/>
|
||||||
<separator string="Security and Authentication" colspan="2"/>
|
<field name="smtp_user"/>
|
||||||
<field name="smtp_encryption" on_change="on_change_encryption(smtp_encryption)"/>
|
<field name="smtp_pass" password="True"/>
|
||||||
<field name="smtp_user"/>
|
<button name="test_smtp_connection" type="object" string="Test Connection" icon="gtk-network" colspan="2"/>
|
||||||
<field name="smtp_pass" password="True"/>
|
</group>
|
||||||
<button name="test_smtp_connection" type="object" string="Test Connection" icon="gtk-network" colspan="2"/>
|
|
||||||
</group>
|
|
||||||
</page>
|
|
||||||
</notebook>
|
|
||||||
</form>
|
</form>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
|
@ -229,7 +229,7 @@ class res_partner(osv.osv):
|
||||||
|
|
||||||
def address_get(self, cr, uid, ids, adr_pref=['default']):
|
def address_get(self, cr, uid, ids, adr_pref=['default']):
|
||||||
address_obj = self.pool.get('res.partner.address')
|
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'])
|
address_rec = address_obj.read(cr, uid, address_ids, ['type'])
|
||||||
res = list(tuple(addr.values()) for addr in address_rec)
|
res = list(tuple(addr.values()) for addr in address_rec)
|
||||||
adr = dict(res)
|
adr = dict(res)
|
||||||
|
|
Loading…
Reference in New Issue