[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9796 revid:launchpad_translations_on_behalf_of_openerp-20140128070310-721zmkmw0ocyz6im
bzr revid: dle@openerp.com-20140128100949-mfa2geyx6rklwtcg
This commit is contained in:
commit
cbba7eb4da
|
@ -219,7 +219,7 @@
|
||||||
<filter name="open" string="In Progress" domain="[('state','in',('open','draft'))]" help="Contracts in progress (open, draft)"/>
|
<filter name="open" string="In Progress" domain="[('state','in',('open','draft'))]" help="Contracts in progress (open, draft)"/>
|
||||||
<filter name="pending" string="To Renew" domain="[('state','=','pending')]" help="Pending contracts"/>
|
<filter name="pending" string="To Renew" domain="[('state','=','pending')]" help="Pending contracts"/>
|
||||||
<filter name="closed" string="Closed" domain="[('state','=','close')]" help="Closed contracts"/>
|
<filter name="closed" string="Closed" domain="[('state','=','close')]" help="Closed contracts"/>
|
||||||
<filter name="cancelled" string="Cancelled" domain="[('state','=','cancel')]" help="Cancelled contracts"/>
|
<filter name="cancelled" string="Cancelled" domain="[('state','=','cancelled')]" help="Cancelled contracts"/>
|
||||||
<separator/>
|
<separator/>
|
||||||
<filter
|
<filter
|
||||||
string="Expired or consumed"
|
string="Expired or consumed"
|
||||||
|
|
|
@ -99,6 +99,9 @@ class CompanyLDAP(osv.osv):
|
||||||
filter = filter_format(conf['ldap_filter'], (login,))
|
filter = filter_format(conf['ldap_filter'], (login,))
|
||||||
try:
|
try:
|
||||||
results = self.query(conf, filter)
|
results = self.query(conf, filter)
|
||||||
|
|
||||||
|
# Get rid of (None, attrs) for searchResultReference replies
|
||||||
|
results = [i for i in results if i[0]]
|
||||||
if results and len(results) == 1:
|
if results and len(results) == 1:
|
||||||
dn = results[0][0]
|
dn = results[0][0]
|
||||||
conn = self.connect(conf)
|
conn = self.connect(conf)
|
||||||
|
|
|
@ -109,7 +109,7 @@ class plugin_handler(osv.osv_memory):
|
||||||
notify = _("Mail successfully pushed, a new %s has been created.") % model
|
notify = _("Mail successfully pushed, a new %s has been created.") % model
|
||||||
else:
|
else:
|
||||||
email_from = msg.get('email_from')
|
email_from = msg.get('email_from')
|
||||||
if email_from:
|
if not email_from:
|
||||||
author_id = False
|
author_id = False
|
||||||
else:
|
else:
|
||||||
authors = mail_thread_obj.message_find_partner_from_emails(cr, uid, [res_id], [email_from])
|
authors = mail_thread_obj.message_find_partner_from_emails(cr, uid, [res_id], [email_from])
|
||||||
|
|
Loading…
Reference in New Issue