diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2011-10-01 21:51:03 +0200 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2011-10-01 21:51:03 +0200 |
| commit | c8a29501e41c3d0d43d2d6c9aad2b8b951a87fe0 (patch) | |
| tree | 47330a9e17dc6c11ff3ecb33c245c1f7c14f8c4f | |
| parent | 26c6e4440b554a06e78eac5bafcc11c3ea5a905a (diff) | |
[FIX] remove warnings, better view for mails
bzr revid: fp@tinyerp.com-20111001195103-sd8y0n4t8snzju9o
| -rw-r--r-- | openerp/addons/base/ir/ir.xml | 30 | ||||
| -rw-r--r-- | openerp/addons/base/res/res_partner.py | 2 |
2 files changed, 14 insertions, 18 deletions
diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml index 79490542b1c..444a6ffcbbc 100644 --- a/openerp/addons/base/ir/ir.xml +++ b/openerp/addons/base/ir/ir.xml @@ -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> diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index 4ef582c97f2..9746db40cc1 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -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) |