[IMP] FIX in MRP demo data + mail stuff

bzr revid: fp@tinyerp.com-20120817133449-y50n3iyh49f6w8j1

diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index ed51c52..79aa167 100644 (file)
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -553,50 +553,39 @@ Andrew</field>
             <field name="subject">Kitchen design</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Email0 inquiry]]></field>
+            <field name="body"><![CDATA[Email0 inquiry]]></field>
             <field name="type">email</field>
             <field name="state">sent</field>
-            <field name="user_id" ref="base.user_root"></field>
         </record>
         <record id="message_note0" model="mail.message">
             <field name="subject">Reply</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Internal note0]]></field>
+            <field name="body"><![CDATA[Internal note0]]></field>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"></field>
         </record>
         <record id="message_note0_comment0" model="mail.message">
             <field name="subject">Reply</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[comment on note0]]></field>
+            <field name="body"><![CDATA[comment on note0]]></field>
             <field name="parent_id" ref="message_note0"/>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"></field>
         </record>
         <record id="message_note0_comment1" model="mail.message">
             <field name="subject">Reply</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[comment1 on note0]]></field>
+            <field name="body"><![CDATA[comment1 on note0]]></field>
             <field name="parent_id" ref="message_note0"/>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"></field>
         </record>
         <record id="message_email1" model="mail.message">
             <field name="subject">Your inquiry</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[hello, outgoing email]]></field>
+            <field name="body"><![CDATA[hello, outgoing email]]></field>
             <field name="type">email</field>
-            <field name="state">received</field>
-            <field name="user_id" ref="base.user_root"></field>
         </record>
 
 

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 1def02b..de4759d 100644 (file)
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -877,15 +877,30 @@ class mail_thread(osv.Model):
     #------------------------------------------------------
 
     # FP Note: this should be a invert function on message_unread field
+    # not sure because if not readonly, it may often write to this field?
+    def message_mark_as_unread(self, cr, uid, ids, context=None):
+        """ Set as read. """
+        notobj = self.pool.get('mail.notification')
+        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
+        cr.execute('''
+            UPDATE mail_notification SET 
+                read=false
+            WHERE
+                message_id IN (SELECT id from mail_message where res_id=any(%s) and model=%s limit 1) and
+                partner_id = %s
+        ''', (ids, self._name, partner_id))
+        return True
+
     def message_mark_as_read(self, cr, uid, ids, context=None):
         """ Set as read. """
         notobj = self.pool.get('mail.notification')
+        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
         cr.execute('''
-            update mail_notification set 
+            UPDATE mail_notification SET 
                 read=true
-            where
-                message_id in (select id from mail_message where res_id in %s and model=%s)
-                user_id = %s
-        ''', (ids, self._name, uid))
+            WHERE
+                message_id IN (SELECT id FROM mail_message WHERE res_id=ANY(%s) AND model=%s) AND
+                partner_id = %s
+        ''', (ids, self._name, partner_id))
         return True
 

diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml
index d0f05a2..952a5e0 100644 (file)
--- a/addons/mrp/mrp_demo.xml
+++ b/addons/mrp/mrp_demo.xml
@@ -49,7 +49,7 @@
             <field name="costs_hour_account_id" ref="account_assembly_hours"/>
             <field name="costs_cycle">0.05</field>
             <field name="costs_cycle_account_id" ref="account_assembly_cycle"/>
-            <field name="costs_journal_id" ref="account.expenses_journal"/>
+            <field name="costs_journal_id" ref="account.exp"/>
             <field name="costs_general_account_id" ref="account.a_expense"/>
             <field name="costs_general_account_id" ref="account.a_expense"/>
             <field name="calendar_id" ref="resource.timesheet_group1"/>