Devishree Brahmbhatt (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-warning-dbr into lp:openobject-addons.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-warning-dbr/+merge/113686
Hello,
Remove main user_id related warning.
Thanks,
DBR
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-warning-dbr/+merge/113686
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-warning-dbr.
=== modified file 'l10n_uk/demo/demo.xml'
--- l10n_uk/demo/demo.xml 2012-07-20 06:33:24 +0000
+++ l10n_uk/demo/demo.xml 2012-08-22 14:24:30 +0000
@@ -1,6 +1,6 @@
<openerp>
<data noupdate="1">
- <record id="smartmode" model="res.partner">
+ <record id="smartmode1" model="res.partner">
<field name="name">SmartMode LTD</field>
<field name="is_company">1</field>
<field name="street">12, Hill Lane</field>
@@ -14,7 +14,7 @@
<record id="res_partner_address_1" model="res.partner">
<field name="name">Vadim Chobanu</field>
- <field name="parent_id" ref="smartmode"/>
+ <field name="parent_id" ref="smartmode1"/>
<field name="use_parent_address" eval="1"/>
<field name="email">[email protected]</field>
<field name="active">1</field>
=== modified file 'mail/mail_thread.py'
--- mail/mail_thread.py 2012-08-15 23:38:31 +0000
+++ mail/mail_thread.py 2012-08-22 14:24:30 +0000
@@ -296,7 +296,7 @@
self.message_create_notify_by_email(cr, uid, vals, user_to_push_ids, context=context)
return msg_id
-
+
def message_get_user_ids_to_notify(self, cr, uid, thread_ids, new_msg_vals, context=None):
# get body
body = new_msg_vals.get('body_html', '') if new_msg_vals.get('content_subtype') == 'html' else new_msg_vals.get('body_text', '')
@@ -1139,7 +1139,7 @@
""" When creating a new message, set as unread if uid is not the
object responsible. """
for obj in self.browse(cr, uid, ids, context=context):
- if obj.message_state and self._columns.get('user_id') and (not obj.user_id or obj.user_id.id != uid):
+ if obj.message_state and ('user_id' in obj._columns.keys()) and (not obj.user_id or obj.user_id.id != uid) :
self.message_mark_as_unread(cr, uid, [obj.id], context=context)
def message_check_and_set_unread(self, cr, uid, ids, context=None):
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
