diff options
| author | Frédéric van der Essen <fva@openerp.com> | 2014-02-25 11:59:24 +0100 |
|---|---|---|
| committer | Frédéric van der Essen <fva@openerp.com> | 2014-02-25 11:59:24 +0100 |
| commit | 009451f1dc9850bcea20f16436a33e2f1815bb89 (patch) | |
| tree | ef38df35deea4bae82fe6e44d5bd8364dbe5a875 | |
| parent | c1d5d858eb462a3d106dfb3f634895d16e261561 (diff) | |
| parent | bb795e929d8239508d58097f06029350296cc22b (diff) | |
[MERGE] from upstream
bzr revid: fva@openerp.com-20140225105924-1r2c9ha7703zlfxz
| -rw-r--r-- | addons/mail/mail_mail.py | 4 | ||||
| -rw-r--r-- | addons/mail/mail_thread.py | 2 | ||||
| -rw-r--r-- | addons/point_of_sale/point_of_sale.py | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py index a8726c16a0d..9d8de07d4f5 100644 --- a/addons/mail/mail_mail.py +++ b/addons/mail/mail_mail.py @@ -160,8 +160,8 @@ class mail_mail(osv.Model): fragment['message_id'] = mail.mail_message_id.id elif mail.model and mail.res_id: fragment.update(model=mail.model, res_id=mail.res_id) - - url = urljoin(base_url, "?%s#%s" % (urlencode(query), urlencode(fragment))) + + url = urljoin(base_url, "/web/login?%s#%s" % (urlencode(query), urlencode(fragment))) return _("""<span class='oe_mail_footer_access'><small>Access your messages and documents <a style='color:inherit' href="%s">in OpenERP</a></small></span>""") % url else: return None diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index 1378aabd3ee..33cc5481108 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -199,7 +199,7 @@ class mail_thread(osv.AbstractModel): ], context=context) for fol in fol_obj.browse(cr, uid, fol_ids, context=context): thread_subtype_dict = res[fol.res_id]['message_subtype_data'] - for subtype in fol.subtype_ids: + for subtype in [st for st in fol.subtype_ids if st.name in thread_subtype_dict]: thread_subtype_dict[subtype.name]['followed'] = True res[fol.res_id]['message_subtype_data'] = thread_subtype_dict diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 912a1402da5..68daefd6ed9 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -547,7 +547,6 @@ class pos_order(osv.osv): if order['amount_return']: session = self.pool.get('pos.session').browse(cr, uid, order['pos_session_id'], context=context) cash_journal = session.cash_journal_id - cash_statement = False if not cash_journal: cash_journal_ids = filter(lambda st: st.journal_id.type=='cash', session.statement_ids) if not len(cash_journal_ids): @@ -565,7 +564,7 @@ class pos_order(osv.osv): try: self.signal_paid(cr, uid, [order_id]) except Exception as e: - _logger.error('ERROR: Could not mark POS Order as Paid.\n'+str(e)) + _logger.error('Could not mark POS Order as Paid: %s', tools.ustr(e)) if to_invoice: self.action_invoice(cr, uid, [order_id], context) |