[MERGE] staging branch

bzr revid: qdp-launchpad@openerp.com-20121207155336-n26m87wnuevqtuv4

14 files changed, 16 insertions, 456 deletions

diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index 4438484aaaf..2c1448b5e6f 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -24,6 +24,7 @@ from lxml import etree
 
 from osv import fields, osv
 from tools.translate import _
+from openerp.osv.orm import setup_modifiers
 
 class account_common_report(osv.osv_memory):
     _name = "account.common.report"
@@ -67,16 +68,16 @@ class account_common_report(osv.osv_memory):
         (_check_company_id, 'The fiscalyear, periods or chart of account chosen have to belong to the same company.', ['chart_account_id','fiscalyear_id','period_from','period_to']),
     ]
 
-
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         if context is None:context = {}
         res = super(account_common_report, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
-        if context.get('active_model', False) == 'account.account' and view_id:
+        if context.get('active_model', False) == 'account.account':
             doc = etree.XML(res['arch'])
             nodes = doc.xpath("//field[@name='chart_account_id']")
             for node in nodes:
                 node.set('readonly', '1')
                 node.set('help', 'If you print the report from Account list/form view it will not consider Charts of account')
+                setup_modifiers(node, res['fields']['chart_account_id'])
             res['arch'] = etree.tostring(doc)
         return res
 
@@ -121,8 +122,8 @@ class account_common_report(osv.osv_memory):
         now = time.strftime('%Y-%m-%d')
         company_id = False
         ids = context.get('active_ids', [])
-        if ids:
-            company_id = self.browse(cr, uid, ids[0], context=context).company_id.id
+        if ids and context.get('active_model') == 'account.account':
+            company_id = self.pool.get('account.account').browse(cr, uid, ids[0], context=context).company_id.id
         fiscalyears = self.pool.get('account.fiscalyear').search(cr, uid, [('date_start', '<', now), ('date_stop', '>', now), ('company_id', '=', company_id)], limit=1)
         return fiscalyears and fiscalyears[0] or False
 
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 9eb8fe90895..368dd7f3b65 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -8,7 +8,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('invoice_id','=',False)]</field>
-            <field name="context">{'search_default_to_invoice': 1}</field>
+            <field name="context">{'search_default_to_invoice': 1, 'search_default_sales': 1}</field>
             <field name="search_view_id" ref="account.view_account_analytic_line_filter"/>
             <field name="help" type="html">
               <p>
@@ -34,7 +34,7 @@
                     <filter icon="terp-go-today" string="To Renew" domain="['|', '&amp;', ('date', '!=', False), ('date', '&lt;=', time.strftime('%%Y-%%m-%%d')), ('is_overdue_quantity', '=', True)]" name="renew"
                         help="The contracts to be renewed because the deadline is passed or the working hours are higher than the allocated hours" />
                     <separator/>
-                    <filter string="Contracts Having a Partner" help="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
+                    <filter string="Customer Contracts" help="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
                     <separator/>
                     <filter string="Contracts not assigned" help="Contracts that are not assigned to an account manager." domain="[('user_id', '=', False)]" icon="terp-personal-" />
                     <field name="partner_id"/>
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 77018898c84..ec62b24dd7c 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -2,43 +2,6 @@
 <openerp>
     <data>
 
-    <!-- Read/Unread actions -->
-
-    <record id="actions_server_crm_meeting_read" model="ir.actions.server">
-        <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"/>
-        <field name="state">code</field>
-        <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
-    </record>
-    <record id="action_crm_meeting_read" model="ir.values">
-        <field name="name">action_crm_meeting_read</field>
-        <field name="action_id" ref="actions_server_crm_meeting_read"/>
-        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_meeting_read'))"/>
-        <field name="key">action</field>
-        <field name="model_id" ref="model_crm_meeting"/>
-        <field name="model">crm.meeting</field>
-        <field name="key2">client_action_multi</field>
-    </record>
-
-    <record id="actions_server_crm_meeting_unread" model="ir.actions.server">
-        <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"/>
-        <field name="state">code</field>
-        <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
-    </record>
-    <record id="action_crm_meeting_unread" model="ir.values">
-        <field name="name">action_crm_meeting_unread</field>
-        <field name="action_id" ref="actions_server_crm_meeting_unread"/>
-        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_meeting_unread'))"/>
-        <field name="key">action</field>
-        <field name="model_id" ref="model_crm_meeting"/>
-        <field name="model">crm.meeting</field>
-        <field name="key2">client_action_multi</field>
-    </record>
 
     <!-- CRM Meetings Types Form View -->
 
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index c552b1835f2..3bbdf05655e 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -2,42 +2,6 @@
 <openerp>
     <data>
 
-        <!-- Read/Unread actions -->
-        <record id="actions_server_crm_lead_unread" model="ir.actions.server">
-            <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"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_crm_lead_unread" model="ir.values">
-            <field name="name">action_crm_lead_unread</field>
-            <field name="action_id" ref="actions_server_crm_lead_unread"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_lead_unread'))"/>
-            <field name="key">action</field>
-            <field name="model_id" ref="model_crm_lead"/>
-            <field name="model">crm.lead</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
-        <record id="actions_server_crm_lead_read" model="ir.actions.server">
-            <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"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_crm_lead_read" model="ir.values">
-            <field name="name">action_crm_lead_read</field>
-            <field name="action_id" ref="actions_server_crm_lead_read"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_lead_read'))"/>
-            <field name="key">action</field>
-            <field name="model_id" ref="model_crm_lead"/>
-            <field name="model">crm.lead</field>
-            <field name="key2">client_action_multi</field>
-        </record>
 
         <!--
             CRM CASE STAGE
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index b4a887505b1..3dc93125ced 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -2,42 +2,6 @@
 <openerp>
     <data>
 
-    <!-- Read/Unread actions -->
-    <record id="actions_server_crm_phonecall_unread" model="ir.actions.server">
-        <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"/>
-        <field name="state">code</field>
-        <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
-    </record>
-    <record id="action_crm_phonecall_unread" model="ir.values">
-        <field name="name">action_crm_phonecall_unread</field>
-        <field name="action_id" ref="actions_server_crm_phonecall_unread"/>
-        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_phonecall_unread'))"/>
-        <field name="key">action</field>
-        <field name="model_id" ref="model_crm_phonecall"/>
-        <field name="model">crm.phonecall</field>
-        <field name="key2">client_action_multi</field>
-    </record>
-
-    <record id="actions_server_crm_phonecall_read" model="ir.actions.server">
-        <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"/>
-        <field name="state">code</field>
-        <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
-    </record>
-    <record id="action_crm_phonecall_read" model="ir.values">
-        <field name="name">action_crm_phonecall_read</field>
-        <field name="action_id" ref="actions_server_crm_phonecall_read"/>
-        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_phonecall_read'))"/>
-        <field name="key">action</field>
-        <field name="model_id" ref="model_crm_phonecall"/>
-        <field name="model">crm.phonecall</field>
-        <field name="key2">client_action_multi</field>
-    </record>
 
 <!--  Phonecall Categories Form View  -->
     <record id="crm_phonecall_categ_action" model="ir.actions.act_window">
@@ -220,8 +184,8 @@
                <separator/>
                <filter string="Unassigned Phonecalls" icon="terp-personal-" domain="[('user_id','=',False)]" help="Unassigned Phonecalls"/>
                <separator/>
-               <filter string="Phone Calls Assigned to Me or My Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                       help="Phone Calls that are assigned to me or to my team(s)"/>
+               <filter string="Phone Calls Assigned to Me or My Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('user_id', '=', uid)]"
+                       help="Phone Calls Assigned to the current user or with a team having the current user as team leader"/>
                <field name="partner_id"/>
                <field name="user_id"/>
                <field name="section_id" string="Sales Team"/>
@@ -236,4 +200,4 @@
     </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index a9a60570735..efdbf1be3b2 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -57,43 +57,6 @@
 
         <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
-        <!-- Event Read/Unread actions -->
-        <record id="actions_server_event_event_unread" model="ir.actions.server">
-            <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"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_event_event_unread" model="ir.values">
-            <field name="name">action_event_event_unread</field>
-            <field name="action_id" ref="actions_server_event_event_unread"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_event_event_unread'))" />
-            <field name="key">action</field>
-            <field name="model_id" ref="model_event_event" />
-            <field name="model">event.event</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
-        <record id="actions_server_event_event_read" model="ir.actions.server">
-            <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"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_event_event_read" model="ir.values">
-            <field name="name">action_event_event_read</field>
-            <field name="action_id" ref="actions_server_event_event_read"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_event_event_read'))" />
-            <field name="key">action</field>
-            <field name="model_id" ref="model_event_event" />
-            <field name="model">event.event</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
         <record model="ir.ui.view" id="view_event_form">
             <field name="name">Events</field>
             <field name="model">event.event</field>
@@ -375,42 +338,6 @@
 
         <!-- EVENTS/REGISTRATIONS/EVENTS  -->
 
-        <!-- Registration Read/Unread actions -->
-        <record id="actions_server_event_registration_unread" model="ir.actions.server">
-            <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"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_event_registration_unread" model="ir.values">
-            <field name="name">action_event_registration_unread</field>
-            <field name="action_id" ref="actions_server_event_registration_unread"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_event_registration_unread'))" />
-            <field name="key">action</field>
-            <field name="model_id" ref="model_event_registration" />
-            <field name="model">event.registration</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
-        <record id="actions_server_event_registration_read" model="ir.actions.server">
-            <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"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_event_registration_read" model="ir.values">
-            <field name="name">action_event_registration_read</field>
-            <field name="action_id" ref="actions_server_event_registration_read"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_event_registration_read'))" />
-            <field name="key">action</field>
-            <field name="model_id" ref="model_event_registration" />
-            <field name="model">event.registration</field>
-            <field name="key2">client_action_multi</field>
-        </record>
 
         <record model="ir.ui.view" id="view_event_registration_tree">
             <field name="name">event.registration.tree</field>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index aba6dd36538..0d2e958728d 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -1,43 +1,6 @@
 <openerp>
     <data>
 
-        <!-- Hr holidays Read/Unread actions -->
-        <record id="actions_server_holidays_unread" model="ir.actions.server">
-            <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"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_holidays_unread" model="ir.values">
-            <field name="name">action_holidays_unread</field>
-            <field name="action_id" ref="actions_server_holidays_unread"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_holidays_unread'))"/>
-            <field name="key">action</field>
-            <field name="model_id" ref="model_hr_holidays"/>
-            <field name="model">hr.holidays</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
-        <record id="actions_server_holidays_read" model="ir.actions.server">
-            <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"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_holidays_read" model="ir.values">
-            <field name="name">action_holidays_read</field>
-            <field name="action_id" ref="actions_server_holidays_read"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_holidays_read'))"/>
-            <field name="key">action</field>
-            <field name="model_id" ref="model_hr_holidays"/>
-            <field name="model">hr.holidays</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
         <record id="view_hr_holidays_filter" model="ir.ui.view">
             <field name="name">hr.holidays.filter</field>
             <field name="model">hr.holidays</field>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 8282c5a300c..e686ee32665 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -35,43 +35,6 @@
 
 
     <!-- Jobs -->
-    <!-- Applicant Read/Unread actions -->
-    <record id="actions_server_applicant_unread" model="ir.actions.server">
-        <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"/>
-        <field name="state">code</field>
-        <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
-    </record>
-    <record id="action_applicant_unread" model="ir.values">
-        <field name="name">action_project_unread</field>
-        <field name="action_id" ref="actions_server_applicant_unread"/>
-        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_applicant_unread'))"/>
-        <field name="key">action</field>
-        <field name="model_id" ref="model_hr_applicant"/>
-        <field name="model">hr.applicant</field>
-        <field name="key2">client_action_multi</field>
-    </record>
-
-    <record id="actions_server_applicant_read" model="ir.actions.server">
-        <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"/>
-        <field name="state">code</field>
-        <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
-    </record>
-    <record id="action_applicant_read" model="ir.values">
-        <field name="name">action_project_read</field>
-        <field name="action_id" ref="actions_server_applicant_read"/>
-        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_applicant_read'))"/>
-        <field name="key">action</field>
-        <field name="model_id" ref="model_hr_applicant"/>
-        <field name="model">hr.applicant</field>
-        <field name="key2">client_action_multi</field>
-    </record>
-
     <record model="ir.ui.view" id="crm_case_tree_view_job">
         <field name="name">Applicants</field>
         <field name="model">hr.applicant</field>
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 8e5280d036a..49362e380f4 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -33,13 +33,13 @@
         -->
         <record id="product_uom_unit" model="product.uom">
             <field name="category_id" ref="product_uom_categ_unit"/>
-            <field name="name">Unit</field>
+            <field name="name">Unit(s)</field>
             <field name="factor" eval="1.0"/>
             <field name="rounding" eval="1.0"/>
         </record>
        <record id="product_uom_dozen" model="product.uom">
             <field name="category_id" ref="product.product_uom_categ_unit"/>
-            <field name="name">Dozen</field>
+            <field name="name">Dozen(s)</field>
             <field name="factor_inv" eval="12"/>
             <field name="uom_type">bigger</field>
         </record>
@@ -55,13 +55,13 @@
             <field name="uom_type">smaller</field>
         </record>
         <record id="product_uom_hour" model="product.uom">
-            <field name="name">Hour</field>
+            <field name="name">Hour(s)</field>
             <field eval="uom_categ_wtime" name="category_id"/>
             <field name="factor" eval="8.0"/>
             <field name="uom_type">smaller</field>
         </record>
         <record id="product_uom_day" model="product.uom">
-            <field name="name">Day</field>
+            <field name="name">Day(s)</field>
             <field eval="uom_categ_wtime" name="category_id"/>
             <field name="factor" eval="1.0"/>
         </record>
@@ -91,7 +91,7 @@
             <field name="uom_type">smaller</field>
         </record>
         <record id="product_uom_litre" model="product.uom">
-            <field name="name">Litre</field>
+            <field name="name">Liter(s)</field>
             <field name="category_id" ref="product_uom_categ_vol"/>
             <field name="factor">1.0</field>
         </record>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 840d9b47ae0..07cbbce63d9 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -19,43 +19,6 @@
             <field name="context">{'search_default_project_id': [active_id], 'default_project_id': active_id}</field>
         </record>
 
-        <!-- Project Read/Unread actions -->
-        <record id="actions_server_project_unread" model="ir.actions.server">
-            <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"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_project_unread" model="ir.values">
-            <field name="name">action_project_unread</field>
-            <field name="action_id" ref="actions_server_project_unread"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_project_unread'))"/>
-            <field name="key">action</field>
-            <field name="model_id" ref="model_project_project"/>
-            <field name="model">project.project</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
-        <record id="actions_server_project_read" model="ir.actions.server">
-            <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"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_project_read" model="ir.values">
-            <field name="name">action_project_read</field>
-            <field name="action_id" ref="actions_server_project_read"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_project_read'))"/>
-            <field name="key">action</field>
-            <field name="model_id" ref="model_project_project"/>
-            <field name="model">project.project</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
         <!-- Project -->
         <record id="edit_project" model="ir.ui.view">
             <field name="name">project.project.form</field>
@@ -342,43 +305,6 @@
 
         <!-- Task -->
 
-        <!-- Task Read/Unread actions -->
-        <record id="actions_server_project_task_unread" model="ir.actions.server">
-            <field name="name">Task: Mark unread</field>
-            <field name="condition">True</field>
-            <field name="type">ir.actions.server</field>
-            <field name="model_id" ref="model_project_task"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_project_task_unread" model="ir.values">
-            <field name="name">action_project_task_unread</field>
-            <field name="action_id" ref="actions_server_project_task_unread"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_project_task_unread'))"/>
-            <field name="key">action</field>
-            <field name="model_id" ref="model_project_task"/>
-            <field name="model">project.task</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
-        <record id="actions_server_project_task_read" model="ir.actions.server">
-            <field name="name">Task: Mark read</field>
-            <field name="condition">True</field>
-            <field name="type">ir.actions.server</field>
-            <field name="model_id" ref="model_project_task"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_project_task_read" model="ir.values">
-            <field name="name">action_project_task_read</field>
-            <field name="action_id" ref="actions_server_project_task_read"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_project_task_read'))"/>
-            <field name="key">action</field>
-            <field name="model_id" ref="model_project_task"/>
-            <field name="model">project.task</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
         <record id="view_task_form2" model="ir.ui.view">
             <field name="name">project.task.form</field>
             <field name="model">project.task</field>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 1d4ee4fc2d1..279fec28411 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -4,43 +4,6 @@
 
         <menuitem  id="menu_project_confi" name="Issues" parent="base.menu_definitions" sequence="2"/>
 
-        <!-- Project issue Read/Unread actions -->
-        <record id="actions_server_project_issue_unread" model="ir.actions.server">
-            <field name="name">Issue: Mark unread</field>
-            <field name="condition">True</field>
-            <field name="type">ir.actions.server</field>
-            <field name="model_id" ref="model_project_issue"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_project_issue_unread" model="ir.values">
-            <field name="name">action_project_issue_unread</field>
-            <field name="action_id" ref="actions_server_project_issue_unread"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_project_issue_unread'))"/>
-            <field name="key">action</field>
-            <field name="model_id" ref="model_project_issue"/>
-            <field name="model">project.issue</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
-        <record id="actions_server_project_issue_read" model="ir.actions.server">
-            <field name="name">Issue: Mark read</field>
-            <field name="condition">True</field>
-            <field name="type">ir.actions.server</field>
-            <field name="model_id" ref="model_project_issue"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_project_issue_read" model="ir.values">
-            <field name="name">action_project_issue_read</field>
-            <field name="action_id" ref="actions_server_project_issue_read"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_project_issue_read'))"/>
-            <field name="key">action</field>
-            <field name="model_id" ref="model_project_issue"/>
-            <field name="model">project.issue</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
         <record model="ir.ui.view" id="project_issue_version_search_view">
             <field name="name">Issue Version</field>
             <field name="model">project.issue.version</field>
diff --git a/addons/project_timesheet/test/work_timesheet.yml b/addons/project_timesheet/test/work_timesheet.yml
index 4867f92b4b1..d8367e9f7d8 100644
--- a/addons/project_timesheet/test/work_timesheet.yml
+++ b/addons/project_timesheet/test/work_timesheet.yml
@@ -18,5 +18,5 @@
     task_ids = self.browse(cr, uid, task_work, context)
     assert task_ids.user_id.id == ref("base.user_demo"), 'Error, The User in Timesheet is not Correct'
     assert task_ids.date == start, 'Error, The Date in Timesheet is not ok'
-    assert task_ids.product_uom_id.name == "Hour", 'Error, The Hour in Timesheet is not ok'
+    assert task_ids.product_uom_id.name == "Hour(s)", 'Error, The Hour in Timesheet is not ok'
 
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index eba27492974..3124c5ebc51 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -132,43 +132,6 @@
       <menuitem name="Products" id="menu_procurement_partner_contact_form" action="product.product_normal_action_puchased"
           parent="menu_procurement_management_product"/>
 
-        <!-- Purchase order Read/Unread actions -->
-        <record id="actions_server_purchase_order_unread" model="ir.actions.server">
-            <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"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_purchase_order_unread" model="ir.values">
-            <field name="name">action_purchase_order_unread</field>
-            <field name="action_id" ref="actions_server_purchase_order_unread"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_purchase_order_unread'))" />
-            <field name="key">action</field>
-            <field name="model_id" ref="model_purchase_order" />
-            <field name="model">purchase.order</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
-        <record id="actions_server_purchase_order_read" model="ir.actions.server">
-            <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"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_purchase_order_read" model="ir.values">
-            <field name="name">action_purchase_order_read</field>
-            <field name="action_id" ref="actions_server_purchase_order_read"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_purchase_order_read'))" />
-            <field name="key">action</field>
-            <field name="model_id" ref="model_purchase_order" />
-            <field name="model">purchase.order</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
         <record model="ir.ui.view" id="purchase_order_calendar">
             <field name="name">purchase.order.calendar</field>
             <field name="model">purchase.order</field>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index dd9cfad066a..45dc7a5819d 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -66,43 +66,6 @@
         </record>
 
 
-        <!-- Sale order Read/Unread actions -->
-        <record id="actions_server_sale_order_unread" model="ir.actions.server">
-            <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"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_sale_order_unread" model="ir.values">
-            <field name="name">action_sale_order_unread</field>
-            <field name="action_id" ref="actions_server_sale_order_unread"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_sale_order_unread'))" />
-            <field name="key">action</field>
-            <field name="model_id" ref="model_sale_order" />
-            <field name="model">sale.order</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
-        <record id="actions_server_sale_order_read" model="ir.actions.server">
-            <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"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_sale_order_read" model="ir.values">
-            <field name="name">action_sale_order_read</field>
-            <field name="action_id" ref="actions_server_sale_order_read"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_sale_order_read'))" />
-            <field name="key">action</field>
-            <field name="model_id" ref="model_sale_order" />
-            <field name="model">sale.order</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
         <record id="view_sale_order_calendar" model="ir.ui.view">
             <field name="name">sale.order.calendar</field>
             <field name="model">sale.order</field>