diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index c028168a2b6..cb8d8ce9dfa 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -233,7 +233,7 @@ class res_partner(osv.osv, format_address): 'date': fields.date('Date', select=1), 'title': fields.many2one('res.partner.title', 'Title'), 'parent_id': fields.many2one('res.partner', 'Related Company'), - 'child_ids': fields.one2many('res.partner', 'parent_id', 'Contacts', domain=[('active','=',True)]), # force "active_test" domain to bypass _search() override + 'child_ids': fields.one2many('res.partner', 'parent_id', 'Contacts', domain=[('active','=',True)]), # force "active_test" domain to bypass _search() override 'ref': fields.char('Reference', size=64, select=1), 'lang': fields.selection(_lang_get, 'Language', help="If the selected language is loaded in the system, all documents related to this contact will be printed in this language. If not, it will be English."), @@ -556,7 +556,6 @@ class res_partner(osv.osv, format_address): if context.get('show_email') and record.email: name = "%s <%s>" % (name, record.email) res.append((record.id, name)) - print '*', res, context return res def _parse_partner_name(self, text, context=None): diff --git a/openerp/import_xml.rng b/openerp/import_xml.rng index 8b9b58831b5..c4e27eb09c5 100644 --- a/openerp/import_xml.rng +++ b/openerp/import_xml.rng @@ -214,6 +214,7 @@ + diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py index 29c52d4d3cf..a92ce679448 100644 --- a/openerp/tools/convert.py +++ b/openerp/tools/convert.py @@ -868,7 +868,7 @@ form: module.record_id""" % (xml_id,) 'id': tpl_id, 'model': 'ir.ui.view', } - for att in ['forcecreate', 'context']: + for att in ['forcecreate', 'context', 'priority']: if att in el.keys(): record_attrs[att] = el.attrib.pop(att)