Christophe Matthieu (OpenERP) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-mail-name-action-chm into 
lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #1082199 in OpenERP Addons: "7.0 mail - configuration - ambiguous lines"
  https://bugs.launchpad.net/openobject-addons/+bug/1082199

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-mail-name-action-chm/+merge/136132

[FIX]
accuracy of the mail server action 'mark read' and 'mark unread'

(see bug : https://bugs.launchpad.net/openobject-addons/+bug/1082199 )
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-mail-name-action-chm/+merge/136132
Your team OpenERP R&D Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-mail-name-action-chm.
=== modified file 'base_calendar/crm_meeting_view.xml'
--- base_calendar/crm_meeting_view.xml	2012-11-15 08:34:00 +0000
+++ base_calendar/crm_meeting_view.xml	2012-11-26 10:43:29 +0000
@@ -5,7 +5,7 @@
     <!-- Read/Unread actions -->
 
     <record id="actions_server_crm_meeting_read" model="ir.actions.server">
-        <field name="name">Mark read</field>
+        <field name="name">CRM meeting : Mark read</field>
         <field name="condition">True</field>
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_crm_meeting"/>
@@ -23,7 +23,7 @@
     </record>
 
     <record id="actions_server_crm_meeting_unread" model="ir.actions.server">
-        <field name="name">Mark unread</field>
+        <field name="name">CRM meeting : Mark unread</field>
         <field name="condition">True</field>
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_crm_meeting"/>

=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml	2012-11-26 07:45:10 +0000
+++ crm/crm_lead_view.xml	2012-11-26 10:43:29 +0000
@@ -4,7 +4,7 @@
 
         <!-- Read/Unread actions -->
         <record id="actions_server_crm_lead_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">CRM lead : Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_crm_lead"/>
@@ -22,7 +22,7 @@
         </record>
 
         <record id="actions_server_crm_lead_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">CRM lead : Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_crm_lead"/>

=== modified file 'crm/crm_phonecall_view.xml'
--- crm/crm_phonecall_view.xml	2012-10-29 09:08:47 +0000
+++ crm/crm_phonecall_view.xml	2012-11-26 10:43:29 +0000
@@ -4,7 +4,7 @@
 
     <!-- Read/Unread actions -->
     <record id="actions_server_crm_phonecall_unread" model="ir.actions.server">
-        <field name="name">Mark unread</field>
+        <field name="name">CRM phonecall : Mark unread</field>
         <field name="condition">True</field>
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_crm_phonecall"/>
@@ -22,7 +22,7 @@
     </record>
 
     <record id="actions_server_crm_phonecall_read" model="ir.actions.server">
-        <field name="name">Mark read</field>
+        <field name="name">CRM phonecall : Mark read</field>
         <field name="condition">True</field>
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_crm_phonecall"/>

=== modified file 'event/event_view.xml'
--- event/event_view.xml	2012-11-21 16:27:53 +0000
+++ event/event_view.xml	2012-11-26 10:43:29 +0000
@@ -59,7 +59,7 @@
 
         <!-- Event Read/Unread actions -->
         <record id="actions_server_event_event_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">Event : Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_event_event"/>
@@ -77,7 +77,7 @@
         </record>
 
         <record id="actions_server_event_event_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">Event : Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_event_event"/>
@@ -377,7 +377,7 @@
 
         <!-- Registration Read/Unread actions -->
         <record id="actions_server_event_registration_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">Event registration : Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_event_registration"/>
@@ -395,7 +395,7 @@
         </record>
 
         <record id="actions_server_event_registration_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">Event registration : Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_event_registration"/>

=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml	2012-11-26 07:41:01 +0000
+++ hr_holidays/hr_holidays_view.xml	2012-11-26 10:43:29 +0000
@@ -3,7 +3,7 @@
 
         <!-- Hr holidays Read/Unread actions -->
         <record id="actions_server_holidays_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">Holidays : Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_hr_holidays"/>
@@ -21,7 +21,7 @@
         </record>
 
         <record id="actions_server_holidays_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">Holidays : Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_hr_holidays"/>

=== modified file 'hr_recruitment/hr_recruitment_view.xml'
--- hr_recruitment/hr_recruitment_view.xml	2012-11-15 12:38:51 +0000
+++ hr_recruitment/hr_recruitment_view.xml	2012-11-26 10:43:29 +0000
@@ -37,7 +37,7 @@
     <!-- Jobs -->
     <!-- Applicant Read/Unread actions -->
     <record id="actions_server_applicant_unread" model="ir.actions.server">
-        <field name="name">Mark unread</field>
+        <field name="name">HR applicant : Mark unread</field>
         <field name="condition">True</field>
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_hr_applicant"/>
@@ -55,7 +55,7 @@
     </record>
 
     <record id="actions_server_applicant_read" model="ir.actions.server">
-        <field name="name">Mark read</field>
+        <field name="name">HR applicant : Mark read</field>
         <field name="condition">True</field>
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_hr_applicant"/>

=== modified file 'project/project_view.xml'
--- project/project_view.xml	2012-11-21 16:27:53 +0000
+++ project/project_view.xml	2012-11-26 10:43:29 +0000
@@ -21,7 +21,7 @@
 
         <!-- Project Read/Unread actions -->
         <record id="actions_server_project_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">Project : Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_project"/>
@@ -39,7 +39,7 @@
         </record>
 
         <record id="actions_server_project_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">Project : Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_project"/>
@@ -344,7 +344,7 @@
 
         <!-- Task Read/Unread actions -->
         <record id="actions_server_project_task_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">Project task : Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_task"/>
@@ -362,7 +362,7 @@
         </record>
 
         <record id="actions_server_project_task_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">Project task : Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_task"/>

=== modified file 'project_issue/project_issue_view.xml'
--- project_issue/project_issue_view.xml	2012-10-31 07:27:59 +0000
+++ project_issue/project_issue_view.xml	2012-11-26 10:43:29 +0000
@@ -6,7 +6,7 @@
 
         <!-- Project issue Read/Unread actions -->
         <record id="actions_server_project_issue_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">Project issue : Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_issue"/>
@@ -24,7 +24,7 @@
         </record>
 
         <record id="actions_server_project_issue_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">Project issue : Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_issue"/>

=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml	2012-11-21 16:27:53 +0000
+++ purchase/purchase_view.xml	2012-11-26 10:43:29 +0000
@@ -134,7 +134,7 @@
 
         <!-- Purchase order Read/Unread actions -->
         <record id="actions_server_purchase_order_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">Purchase : Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_purchase_order"/>
@@ -152,7 +152,7 @@
         </record>
 
         <record id="actions_server_purchase_order_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">Purchase : Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_purchase_order"/>

=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml	2012-11-20 11:36:00 +0000
+++ sale/sale_view.xml	2012-11-26 10:43:29 +0000
@@ -68,7 +68,7 @@
 
         <!-- Sale order Read/Unread actions -->
         <record id="actions_server_sale_order_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">Sale : Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_sale_order"/>
@@ -86,7 +86,7 @@
         </record>
 
         <record id="actions_server_sale_order_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">Sale : Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_sale_order"/>

_______________________________________________
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

Reply via email to