From 0097bfef95d572fc42030a85d813cb0804dfda71 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 26 Mar 2012 17:16:29 +0530
Subject: [PATCH 01/13] [IMP] hr_holidays : Improved the field defination,
 button is properly aligned with state, improve the calendar view and remove
 the filter.

bzr revid: mdi@tinyerp.com-20120326114629-o5yrzqqa93qzuszt
---
 addons/hr_holidays/hr_holidays.py       | 12 ++++++------
 addons/hr_holidays/hr_holidays_view.xml | 13 ++++++-------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 3bb7a8e4982..37d51bbef9c 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -118,8 +118,8 @@ class hr_holidays(osv.osv):
             \nThe state is \'Refused\', when holiday request is refused by manager.\
             \nThe state is \'Approved\', when holiday request is approved by manager.'),
         'user_id':fields.related('employee_id', 'user_id', type='many2one', relation='res.users', string='User', store=True),
-        'date_from': fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)]}, select=True),
-        'date_to': fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)]}),
+        'date_from': fields.date('Start Date', readonly=True, states={'draft':[('readonly',False)]}, select=True),
+        'date_to': fields.date('End Date', readonly=True, states={'draft':[('readonly',False)]}),
         'holiday_status_id': fields.many2one("hr.holidays.status", "Leave Type", required=True,readonly=True, states={'draft':[('readonly',False)]}),
         'employee_id': fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)]}, help='Leave Manager can let this field empty if this leave request/allocation is for every employee'),
         #'manager_id': fields.many2one('hr.employee', 'Leave Manager', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
@@ -186,11 +186,11 @@ class hr_holidays(osv.osv):
     def _get_number_of_days(self, date_from, date_to):
         """Returns a float equals to the timedelta between two dates given as string."""
 
-        DATETIME_FORMAT = "%Y-%m-%d %H:%M:%S"
+        DATETIME_FORMAT = "%Y-%m-%d"
         from_dt = datetime.datetime.strptime(date_from, DATETIME_FORMAT)
         to_dt = datetime.datetime.strptime(date_to, DATETIME_FORMAT)
         timedelta = to_dt - from_dt
-        diff_day = timedelta.days + float(timedelta.seconds) / 86400
+        diff_day = timedelta.days
         return diff_day
 
     def unlink(self, cr, uid, ids, context=None):
@@ -413,8 +413,8 @@ class hr_employee(osv.osv):
 
     def _get_leave_status(self, cr, uid, ids, name, args, context=None):
         holidays_id = self.pool.get('hr.holidays').search(cr, uid, 
-           [('employee_id', 'in', ids), ('date_from','<=',time.strftime('%Y-%m-%d %H:%M:%S')), 
-            ('date_to','>=',time.strftime('%Y-%m-%d %H:%M:%S')),('type','=','remove'),('state','not in',('cancel','refuse'))],
+           [('employee_id', 'in', ids), ('date_from','<=',time.strftime('%Y-%m-%d')), 
+            ('date_to','>=',time.strftime('%Y-%m-%d')),('type','=','remove'),('state','not in',('cancel','refuse'))],
            context=context)
         result = {}
         for id in ids:
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index c01bfe99ad3..f74ca860ec6 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -51,6 +51,7 @@
             <field name="type">calendar</field>
             <field name="arch" type="xml">
                 <calendar string="Leave Request" color="user_id" date_start="date_from" date_stop="date_to">
+                    <field name="user_id"/>
                     <field name="holiday_status_id"/>
                 </calendar>
             </field>
@@ -86,9 +87,8 @@
                             <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
                             <separator string="Reasons" colspan="4"/>
                             <field name="notes" nolabel="1" colspan="4"/>
-                            <newline/>
-                            <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}' colspan="2"/>
-                            <group colspan="2" col="6">
+                            <group colspan="4" col="8">
+                                <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                                 <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                                 <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
@@ -129,9 +129,8 @@
                         <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
                         <separator string="Reasons" colspan="4"/>
                         <field name="notes" nolabel="1" colspan="4"/>
-                        <newline/>
-                        <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}' colspan="2"/>
-                        <group colspan="2" col="6">
+                        <group colspan="4" col="8">
+                            <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                             <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user"/>
                             <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                             <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
@@ -258,7 +257,7 @@
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="edit_holiday_new"/>
-            <field name="context">{"search_default_department_id": department_id, "search_default_my_leaves": 1}</field>
+            <field name="context">{"search_default_department_id": department_id}</field>
             <field name="domain">[('type','=','remove')]</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
             <field name="help">Leave requests can be recorded by employees and validated by their managers. Once a leave request is validated, it appears automatically in the agenda of the employee. You can define several allowance types (paid holidays, sickness, etc.) and manage allowances per type.</field>

From 93e117b500c15be665d542c49bb86f9e451bfa4e Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 26 Mar 2012 18:21:43 +0530
Subject: [PATCH 02/13] [IMP] hr_holidays : Improved the test cases.

bzr revid: mdi@tinyerp.com-20120326125143-7m3rd2y6pviwsv45
---
 addons/hr_holidays/test/test_hr_holiday.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/test/test_hr_holiday.yml b/addons/hr_holidays/test/test_hr_holiday.yml
index 9228a7a381e..92497742058 100644
--- a/addons/hr_holidays/test/test_hr_holiday.yml
+++ b/addons/hr_holidays/test/test_hr_holiday.yml
@@ -6,8 +6,8 @@
   !record {model: hr.holidays, id: hr_holiday1}:
     name: Sick Leave
     holiday_status_id: holiday_status_cl
-    date_from: !eval time.strftime('%Y-%m-10 10:00:00')
-    date_to: !eval time.strftime('%Y-%m-11 19:00:00')
+    date_from: !eval time.strftime('%Y-%m-10')
+    date_to: !eval time.strftime('%Y-%m-11')
     employee_id: hr.employee_fp
     type: remove
 -

From 87f4fdbcb3817201743523f000f7e8554a19c5f2 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Tue, 27 Mar 2012 10:48:04 +0530
Subject: [PATCH 03/13] [IMP] hr_holidays: small change in xml

bzr revid: psi@tinyerp.com-20120327051804-71hopmvwyx41q6ym
---
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index f74ca860ec6..94bb7eaca5e 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -19,7 +19,7 @@
                          help="Holidays during last month"/>
                         <separator orientation="vertical"/>
                         <field name="employee_id">
-                            <filter icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
+                            <filter icon="terp-personal" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
                         </field>
                         <field name="department_id" widget="selection">
                             <filter icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>

From 5828ad66cf6f08b0d214436690d50c4c899060ff Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 29 Mar 2012 15:51:24 +0530
Subject: [PATCH 04/13] [IMP] hr_holidays : Improved the field definationfrom
 date to datetime and its related changes.

bzr revid: mdi@tinyerp.com-20120329102124-ktotpg7cthlci1oy
---
 addons/hr_holidays/hr_holidays.py           | 12 ++++++------
 addons/hr_holidays/test/test_hr_holiday.yml |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 37d51bbef9c..228324a9f4e 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -118,8 +118,8 @@ class hr_holidays(osv.osv):
             \nThe state is \'Refused\', when holiday request is refused by manager.\
             \nThe state is \'Approved\', when holiday request is approved by manager.'),
         'user_id':fields.related('employee_id', 'user_id', type='many2one', relation='res.users', string='User', store=True),
-        'date_from': fields.date('Start Date', readonly=True, states={'draft':[('readonly',False)]}, select=True),
-        'date_to': fields.date('End Date', readonly=True, states={'draft':[('readonly',False)]}),
+        'date_from': fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)]}, select=True),
+        'date_to': fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)]}),
         'holiday_status_id': fields.many2one("hr.holidays.status", "Leave Type", required=True,readonly=True, states={'draft':[('readonly',False)]}),
         'employee_id': fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)]}, help='Leave Manager can let this field empty if this leave request/allocation is for every employee'),
         #'manager_id': fields.many2one('hr.employee', 'Leave Manager', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
@@ -186,11 +186,11 @@ class hr_holidays(osv.osv):
     def _get_number_of_days(self, date_from, date_to):
         """Returns a float equals to the timedelta between two dates given as string."""
 
-        DATETIME_FORMAT = "%Y-%m-%d"
+        DATETIME_FORMAT = "%Y-%m-%d %H:%M:%S"
         from_dt = datetime.datetime.strptime(date_from, DATETIME_FORMAT)
         to_dt = datetime.datetime.strptime(date_to, DATETIME_FORMAT)
         timedelta = to_dt - from_dt
-        diff_day = timedelta.days
+        diff_day = timedelta.days + float(timedelta.seconds) / 86400
         return diff_day
 
     def unlink(self, cr, uid, ids, context=None):
@@ -413,8 +413,8 @@ class hr_employee(osv.osv):
 
     def _get_leave_status(self, cr, uid, ids, name, args, context=None):
         holidays_id = self.pool.get('hr.holidays').search(cr, uid, 
-           [('employee_id', 'in', ids), ('date_from','<=',time.strftime('%Y-%m-%d')), 
-            ('date_to','>=',time.strftime('%Y-%m-%d')),('type','=','remove'),('state','not in',('cancel','refuse'))],
+           [('employee_id', 'in', ids), ('date_from','<=',time.strftime('%Y-%m-%d %H:%M:%S')),
+            ('date_to','>=',time.strftime('%Y-%m-%d %H:%M:%S')),('type','=','remove'),('state','not in',('cancel','refuse'))],
            context=context)
         result = {}
         for id in ids:
diff --git a/addons/hr_holidays/test/test_hr_holiday.yml b/addons/hr_holidays/test/test_hr_holiday.yml
index 92497742058..9228a7a381e 100644
--- a/addons/hr_holidays/test/test_hr_holiday.yml
+++ b/addons/hr_holidays/test/test_hr_holiday.yml
@@ -6,8 +6,8 @@
   !record {model: hr.holidays, id: hr_holiday1}:
     name: Sick Leave
     holiday_status_id: holiday_status_cl
-    date_from: !eval time.strftime('%Y-%m-10')
-    date_to: !eval time.strftime('%Y-%m-11')
+    date_from: !eval time.strftime('%Y-%m-10 10:00:00')
+    date_to: !eval time.strftime('%Y-%m-11 19:00:00')
     employee_id: hr.employee_fp
     type: remove
 -

From 1226730d36772362c027d91edf796ac14e2e8a21 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 3 Apr 2012 05:16:54 +0000
Subject: [PATCH 05/13] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120403045407-ppsmp0hti8578j1y
bzr revid: launchpad_translations_on_behalf_of_openerp-20120403051654-xzwvjn3xetpy2otw
---
 addons/sale_crm/i18n/nb.po | 135 +++++++++++++++++++++++++++++++++++++
 addons/web/i18n/nl.po      |   8 +--
 2 files changed, 139 insertions(+), 4 deletions(-)
 create mode 100644 addons/sale_crm/i18n/nb.po

diff --git a/addons/sale_crm/i18n/nb.po b/addons/sale_crm/i18n/nb.po
new file mode 100644
index 00000000000..844a80bbf78
--- /dev/null
+++ b/addons/sale_crm/i18n/nb.po
@@ -0,0 +1,135 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-04-02 11:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-03 04:53+0000\n"
+"X-Generator: Launchpad (build 15052)\n"
+
+#. module: sale_crm
+#: field:sale.order,categ_id:0
+msgid "Category"
+msgstr "Kategori"
+
+#. module: sale_crm
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:112
+#, python-format
+msgid "Converted to Sales Quotation(%s)."
+msgstr ""
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "Convert to Quotation"
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
+#, python-format
+msgid "Data Insufficient!"
+msgstr "Utilstrekkelig data!"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
+#, python-format
+msgid "Customer has no addresses defined!"
+msgstr "Kunden har ikke definert en adresse!"
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_crm_make_sale
+msgid "Make sales"
+msgstr ""
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "_Create"
+msgstr "_Opprett"
+
+#. module: sale_crm
+#: view:sale.order:0
+msgid "My Sales Team(s)"
+msgstr "Mine salgsteam"
+
+#. module: sale_crm
+#: help:crm.make.sale,close:0
+msgid ""
+"Check this to close the opportunity after having created the sale order."
+msgstr ""
+
+#. module: sale_crm
+#: view:board.board:0
+msgid "My Opportunities"
+msgstr ""
+
+#. module: sale_crm
+#: view:crm.lead:0
+msgid "Convert to Quote"
+msgstr ""
+
+#. module: sale_crm
+#: field:crm.make.sale,shop_id:0
+msgid "Shop"
+msgstr "Butikk"
+
+#. module: sale_crm
+#: field:crm.make.sale,partner_id:0
+msgid "Customer"
+msgstr "Kunde"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:92
+#, python-format
+msgid "Opportunity: %s"
+msgstr ""
+
+#. module: sale_crm
+#: field:crm.make.sale,close:0
+msgid "Close Opportunity"
+msgstr ""
+
+#. module: sale_crm
+#: view:board.board:0
+msgid "My Planned Revenues by Stage"
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:110
+#, python-format
+msgid "Opportunity  '%s' is converted to Quotation."
+msgstr ""
+
+#. module: sale_crm
+#: view:sale.order:0
+#: field:sale.order,section_id:0
+msgid "Sales Team"
+msgstr "Salgsteam"
+
+#. module: sale_crm
+#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
+msgid "Make Quotation"
+msgstr "Lag tilbud"
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_sale_order
+msgid "Sales Order"
+msgstr "Salgsordre"
diff --git a/addons/web/i18n/nl.po b/addons/web/i18n/nl.po
index 057d2f0ddf1..78cd13ffd97 100644
--- a/addons/web/i18n/nl.po
+++ b/addons/web/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-14 15:27+0100\n"
-"PO-Revision-Date: 2012-03-29 13:30+0000\n"
+"PO-Revision-Date: 2012-04-02 13:15+0000\n"
 "Last-Translator: Erwin <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-30 04:48+0000\n"
-"X-Generator: Launchpad (build 15032)\n"
+"X-Launchpad-Export-Date: 2012-04-03 05:16+0000\n"
+"X-Generator: Launchpad (build 15052)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:172
@@ -879,7 +879,7 @@ msgstr "OpenERP Enterprise Contract."
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:257
 msgid "Your report will be sent to the OpenERP Enterprise team."
-msgstr "Uw rapport wordt verzonden naar het OpenERP Entreprice team."
+msgstr "Uw rapport wordt verzonden naar het OpenERP Enterprise team."
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:259

From 7270d0461800389b54d9cf56aedfa2ea7d397e22 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 3 Apr 2012 09:08:49 +0200
Subject: [PATCH 06/13] [FIX] spurious context evaluation warning notifications

bzr revid: xmo@openerp.com-20120403070849-d0m9aldt0yvbh8uw
---
 addons/web/static/src/js/core.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 073489a8728..fef97527a68 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -568,7 +568,6 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
             '</ul>';
         try {
             var ctx = this.test_eval_contexts(source.contexts);
-            ctx = null;
             if (!_.isEqual(ctx, expected.context)) {
                 openerp.webclient.notification.warn('Context mismatch, report to xmo',
                     _.str.sprintf(match_template, {

From 6f24433aef46bb059ed07bd3b11faf758529ca91 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 3 Apr 2012 15:51:13 +0200
Subject: [PATCH 07/13] [FIX] json-serialize evaluated data on evaluation
 failure

bzr revid: xmo@openerp.com-20120403135113-yac2m82nuwn4f23x
---
 addons/web/static/src/js/core.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index fef97527a68..fe0e5200bb0 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -580,7 +580,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
             openerp.webclient.notification.warn('Context fail, report to xmo',
                 _.str.sprintf(fail_template, {
                     error: e.message,
-                    source: source.contexts
+                    source: JSON.stringify(source.contexts)
                 }), true);
         }
 
@@ -598,7 +598,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
             openerp.webclient.notification.warn('Domain fail, report to xmo',
                 _.str.sprintf(fail_template, {
                     error: e.message,
-                    source: source.domains
+                    source: JSON.stringify(source.domains)
                 }), true);
         }
 
@@ -616,7 +616,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
             openerp.webclient.notification.warn('GroupBy fail, report to xmo',
                 _.str.sprintf(fail_template, {
                     error: e.message,
-                    source: source.group_by_seq
+                    source: JSON.stringify(source.group_by_seq)
                 }), true);
         }
     },

From aa0205c8498a0b3f25c5ab28e1a4f907c3f8c3f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 3 Apr 2012 16:54:26 +0200
Subject: [PATCH 08/13] [REF] Cleaned model and code: removed classmethods,
 moved some code to needaction_users, cleaned models.

bzr revid: tde@openerp.com-20120403145426-gjhdwhxb44bme8mi
---
 openerp/addons/base/ir/ir.xml                 |  12 +-
 openerp/addons/base/ir/ir_needaction.py       | 127 ++++++++----------
 openerp/addons/base/ir/ir_ui_menu.py          |   2 +-
 .../addons/base/security/ir.model.access.csv  |   2 +-
 openerp/osv/orm.py                            |  60 ++++-----
 5 files changed, 96 insertions(+), 107 deletions(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 26af4365f58..877de335dcc 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -662,9 +662,9 @@
         <menuitem action="ir_action_wizard" id="menu_ir_action_wizard" parent="base.next_id_6"/>
 
         <!-- Needaction mechanism -->
-        <record model="ir.ui.view" id="view_notification_tree">
-            <field name="name">ir.needaction_users_rel.tree</field>
-            <field name="model">ir.needaction_users_rel</field>
+        <record model="ir.ui.view" id="view_ir_needaction_users_tree">
+            <field name="name">ir.needaction_users.tree</field>
+            <field name="model">ir.needaction_users</field>
             <field name="type">tree</field>
             <field name="sequence">10</field>
             <field name="arch" type="xml">
@@ -676,14 +676,14 @@
             </field>
         </record>
 
-        <record id="action_view_needaction_users_rel" model="ir.actions.act_window">
+        <record id="action_view_needaction_users" model="ir.actions.act_window">
             <field name="name">Need action relationships</field>
-            <field name="res_model">ir.needaction_users_rel</field>
+            <field name="res_model">ir.needaction_users</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem id="menu_needaction_users_rel" name="Need actions" parent="base.menu_users" sequence="20" action="action_view_needaction_users_rel" groups="base.group_extended"/>
+        <menuitem id="menu_needaction_users" name="Need actions" parent="base.menu_users" sequence="20" action="action_view_needaction_users" groups="base.group_extended"/>
         
         <!-- Companies -->
         <menuitem id="menu_res_company_global"
diff --git a/openerp/addons/base/ir/ir_needaction.py b/openerp/addons/base/ir/ir_needaction.py
index beef291d775..ae13cc40900 100644
--- a/openerp/addons/base/ir/ir_needaction.py
+++ b/openerp/addons/base/ir/ir_needaction.py
@@ -24,9 +24,9 @@ from operator import itemgetter
 from osv import osv, fields
 from tools.translate import _
 
-class ir_needaction_users_rel(osv.osv):
+class ir_needaction_users(osv.osv):
     '''
-    ir_needaction_users_rel holds data related to the needaction
+    ir_needaction_users holds data related to the needaction
     mechanism inside OpenERP. A needaction is characterized by:
     - res_model: model of the record requiring an action
     - res_id: ID of the record requiring an action
@@ -34,7 +34,7 @@ class ir_needaction_users_rel(osv.osv):
       has to perform the action
     '''
     
-    _name = 'ir.needaction_users_rel'
+    _name = 'ir.needaction_users'
     _description = 'Needaction relationship table'
     _rec_name = 'id'
     _order = 'id desc'
@@ -46,6 +46,41 @@ class ir_needaction_users_rel(osv.osv):
         'user_id': fields.many2one('res.users', string='Related User',
                         ondelete='cascade', select=1, required=True),
     }
+    
+    def _get_users(self, cr, uid, res_ids, res_model, context=None):
+        """Given res_ids of res_model, get user_ids present in table"""
+        if context is None:
+            context = {}
+        needact_ids = self.search(cr, uid, [('res_model', '=', res_model), ('res_id', 'in', res_ids)], context=context)
+        return map(itemgetter('res_id'), self.read(cr, uid, needact_ids, context=context))
+    
+    def create_users(self, cr, uid, res_ids, res_model, user_ids, context=None):
+        """Given res_ids of res_model, add user_ids to the relationship table"""
+        if context is None:
+            context = {}
+        for res_id in res_ids:
+            for user_id in user_ids:
+                self.create(cr, uid, {'res_model': res_model, 'res_id': res_id, 'user_id': user_id}, context=context)
+        return True
+    
+    def unlink_users(self, cr, uid, res_ids, res_model, context=None):
+        """Given res_ids of res_model, delete all entries in the relationship table"""
+        if context is None:
+            context = {}
+        to_del_ids = self.search(cr, uid, [('res_model', '=', res_model), ('res_id', 'in', res_ids)], context=context)
+        return self.unlink(cr, uid, to_del_ids, context=context)
+    
+    def update_users(self, cr, uid, res_ids, res_model, user_ids, context=None):
+        """Given res_ids of res_model, update their entries in the relationship table to user_ids"""
+        # read current records
+        cur_users = self._get_users(cr, uid, res_ids, res_model, context=context)
+        if len(cur_users) == len(user_ids) and all([cur_user in user_ids for cur_user in cur_users]):
+            return True
+        # unlink old records
+        self.unlink_users(cr, uid, res_ids, res_model, context=context)
+        # link new records
+        self.create_users(cr, uid, res_ids, res_model, user_ids, context=context)
+        return True
 
 
 class ir_needaction(osv.osv):
@@ -57,7 +92,7 @@ class ir_needaction(osv.osv):
     validation by a manager, this mechanism allows to set a list of
     users asked to perform an action.
     
-    This class wraps a table (base.needaction_users_rel) that behaves
+    This class wraps a table (ir.needaction_users) that behaves
     like a many2many field. However, no field is added to the model
     inheriting from base.needaction. The mixin class manages the low-level
     considerations of updating relationships. Every change made on the
@@ -85,50 +120,6 @@ class ir_needaction(osv.osv):
     _name = 'ir.needaction'
     _description = 'Need action of users on records API'
     
-    _columns = {
-    }
-    
-    #------------------------------------------------------
-    # need action relationship management
-    #------------------------------------------------------
-    
-    def _get_users(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        needact_obj = self.pool.get('ir.needaction_users_rel')
-        needact_ids = needact_obj.search(cr, uid, [('res_model', '=', self._name), ('res_id', 'in', ids)], context=context)
-        return needact_obj.read(cr, uid, needact_ids, context=context)
-    
-    def _link_users(self, cr, uid, ids, user_ids, context=None):
-        """Given ids of model self._name, add user_ids to the relationship table"""
-        if context is None:
-            context = {}
-        needact_obj = self.pool.get('ir.needaction_users_rel')
-        for id in ids:
-            for user_id in user_ids:
-                needact_obj.create(cr, uid, {'res_model': self._name, 'res_id': id, 'user_id': user_id}, context=context)
-        return True
-    
-    def _unlink_users(self, cr, uid, ids, context=None):
-        """Given ids of model self._name, delete all entries in the relationship table"""
-        if context is None:
-            context = {}
-        needact_obj = self.pool.get('ir.needaction_users_rel')
-        to_del_ids = needact_obj.search(cr, uid, [('res_model', '=', self._name), ('res_id', 'in', ids)], context=context)
-        return needact_obj.unlink(cr, uid, to_del_ids, context=context)
-    
-    def _update_users(self, cr, uid, ids, user_ids, context=None):
-        """Given ids of model self._name, update their entries in the relationship table to user_ids"""
-        # read current records
-        cur_needact_objs = self._get_users(cr, uid, ids, context=None)
-        if len(cur_needact_objs) == len(user_ids) and all([cur_needact_obj['user_id'] in user_ids for cur_needact_obj in cur_needact_objs]):
-            return True
-        # unlink old records
-        self._unlink_users(cr, uid, ids, context=context)
-        # link new records
-        self._link_users(cr, uid, ids, user_ids, context=context)
-        return True
-    
     #------------------------------------------------------
     # Addon API
     #------------------------------------------------------
@@ -139,29 +130,32 @@ class ir_needaction(osv.osv):
     def create(self, cr, uid, values, context=None):
         if context is None:
             context = {}
+        needact_table_obj = self.pool.get('ir.needaction_users')
         # perform create
         obj_id = super(ir_needaction, self).create(cr, uid, values, context=context)
         # link user_ids
         needaction_user_ids = self.get_needaction_user_ids(cr, uid, [obj_id], context=context)
-        self._link_users(cr, uid, [obj_id], needaction_user_ids[obj_id], context=context)
+        needact_table_obj.create_users(cr, uid, [obj_id], self._name, needaction_user_ids[obj_id], context=context)
         return obj_id
     
     def write(self, cr, uid, ids, values, context=None):
         if context is None:
             context = {}
+        needact_table_obj = self.pool.get('ir.needaction_users')
         # perform write
         write_res = super(ir_needaction, self).write(cr, uid, ids, values, context=context)
         # get and update user_ids
         needaction_user_ids = self.get_needaction_user_ids(cr, uid, ids, context=context)
         for id in ids:
-            self._update_users(cr, uid, [id], needaction_user_ids[id], context=context)
+            needact_table_obj.update_users(cr, uid, [id], self._name, needaction_user_ids[id], context=context)
         return write_res
     
     def unlink(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
         # unlink user_ids
-        self._unlink_users(cr, uid, ids, context=context)
+        needact_table_obj = self.pool.get('ir.needaction_users')
+        needact_table_obj.unlink_users(cr, uid, ids, self._name, context=context)
         # perform unlink
         return super(ir_needaction, self).unlink(cr, uid, ids, context=context)
     
@@ -169,36 +163,33 @@ class ir_needaction(osv.osv):
     # Need action API
     #------------------------------------------------------
     
-    @classmethod
-    def needaction_get_record_ids(cls, cr, uid, model_name, user_id, limit=80, context=None):
-        """Given a model and a user_id
+    def needaction_get_record_ids(self, cr, uid, user_id, limit=80, context=None):
+        """Given the current model and a user_id
            get the number of actions it has to perform"""
         if context is None:
             context = {}
-        need_act_obj = pooler.get_pool(cr.dbname).get('ir.needaction_users_rel')
-        need_act_ids = need_act_obj.search(cr, uid, [('res_model', '=', model_name), ('user_id', '=', user_id)], limit=limit, context=context)
-        return map(itemgetter('res_id'), need_act_obj.read(cr, uid, need_act_ids, context=context))
+        needact_table_obj = self.pool.get('ir.needaction_users')
+        needact_table_ids = needact_table_obj.search(cr, uid, [('res_model', '=', self._name), ('user_id', '=', user_id)], limit=limit, context=context)
+        return map(itemgetter('res_id'), needact_table_obj.read(cr, uid, needact_table_ids, context=context))
     
-    @classmethod
-    def needaction_get_action_count(cls, cr, uid, model_name, user_id, limit=80, context=None):
-        """Given a model and a user_id
+    def needaction_get_action_count(self, cr, uid, user_id, limit=80, context=None):
+        """Given the current model and a user_id
            get the number of actions it has to perform"""
         if context is None:
             context = {}
-        need_act_obj = pooler.get_pool(cr.dbname).get('ir.needaction_users_rel')
-        return need_act_obj.search(cr, uid, [('res_model', '=', model_name), ('user_id', '=', user_id)], limit=limit, count=True, context=context)
+        needact_table_obj = self.pool.get('ir.needaction_users')
+        return needact_table_obj.search(cr, uid, [('res_model', '=', self._name), ('user_id', '=', user_id)], limit=limit, count=True, context=context)
     
-    @classmethod
-    def needaction_get_record_references(cls, cr, uid, user_id, offset=None, limit=None, order=None, context=None):
+    def needaction_get_record_references(self, cr, uid, user_id, offset=None, limit=None, order=None, context=None):
         """For a given user_id, get all the records that asks this user to
            perform an action. Records are given as references, a list of
            tuples (model_name, record_id).
            This method is trans-model."""
         if context is None:
             context = {}
-        need_act_obj = pooler.get_pool(cr.dbname).get('ir.needaction_users_rel')
-        need_act_ids = need_act_obj.search(cr, uid, [('user_id', '=', user_id)], offset=offset, limit=limit, order=order, context=context)
-        need_acts = need_act_obj.read(cr, uid, need_act_ids, context=context)
-        return map(itemgetter('res_model', 'id'), need_acts)
+        needact_table_obj = self.pool.get('ir.needaction_users')
+        needact_table_ids = needact_table_obj.search(cr, uid, [('user_id', '=', user_id)], offset=offset, limit=limit, order=order, context=context)
+        needact_records = needact_table_obj.read(cr, uid, needact_table_ids, context=context)
+        return map(itemgetter('res_model', 'id'), needact_records)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py
index fe31d80b99f..f992e06b37f 100644
--- a/openerp/addons/base/ir/ir_ui_menu.py
+++ b/openerp/addons/base/ir/ir_ui_menu.py
@@ -262,7 +262,7 @@ class ir_ui_menu(osv.osv):
         for menu in self.browse(cr, uid, ids, context=context):
             res[menu.id] = {}
             if menu.action and menu.action.type == 'ir.actions.act_window' and menu.action.res_model:
-                menu_needaction_res = osv.osv.get_needaction_info(cr, uid, menu.action.res_model, uid, domain=menu.action.domain, context=context)
+                menu_needaction_res = self.pool.get(menu.action.res_model).get_needaction_info(cr, uid, uid, domain=menu.action.domain, context=context)
             else:
                 menu_needaction_res = [False, 0, ()]
             res[menu.id]['needaction_enabled'] = menu_needaction_res[0]
diff --git a/openerp/addons/base/security/ir.model.access.csv b/openerp/addons/base/security/ir.model.access.csv
index 1ed4d96c223..08410cc6357 100644
--- a/openerp/addons/base/security/ir.model.access.csv
+++ b/openerp/addons/base/security/ir.model.access.csv
@@ -122,4 +122,4 @@
 "access_ir_mail_server_all","ir_mail_server","model_ir_mail_server",,1,0,0,0
 "access_ir_actions_todo_category","ir_actions_todo_category","model_ir_actions_todo_category","group_system",1,1,1,1
 "access_ir_actions_client","ir_actions_client all","model_ir_actions_client",,1,0,0,0
-"access_ir_needaction_users_rel","ir_needaction_users_rel all","model_ir_needaction_users_rel",,1,1,1,1
+"access_ir_needaction_users","ir_needaction_users","model_ir_needaction_users",,1,1,1,1
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index e34aa7c568e..a59ecb941ff 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -721,36 +721,6 @@ class BaseModel(object):
                 },
                 context=context
         )
-
-    @staticmethod
-    def get_needaction_info(cr, uid, model_name, user_id, limit=None, order=None, domain=False, context=None):
-        """Base method for needaction mechanism
-           - see ir.needaction for actual implementation
-           - if the model uses the need action mechanism
-             (hasattr(model_obj, 'needaction_get_record_ids')):
-              - get the record ids on which the user has actions to perform
-              - evaluate the menu domain
-              - compose a new domain: menu domain, limited to ids of
-                records requesting an action
-              - count the number of records maching that domain, that
-                is the number of actions the user has to perform
-           - this method returns default values
-           :param: model_name: the name of the model (ex: hr.holidays)
-           :param: user_id: the id of user
-           :return: [uses_needaction=True/False, needaction_uid_ctr=%d]
-        """
-        model_obj = pooler.get_pool(cr.dbname).get(model_name)
-        if hasattr(model_obj, 'needaction_get_record_ids'):
-            ids = model_obj.needaction_get_record_ids(cr, uid, model_name, user_id, limit=8096, context=context)
-            if not ids:
-                return (True, 0, [])
-            if domain:
-                new_domain = eval(domain) + [('id', 'in', ids)]
-            else:
-                new_domain = [('id', 'in', ids)]
-            return (True, model_obj.search(cr, uid, new_domain, limit=limit, order=order, count=True), ids)
-        else:
-            return (False, 0, [])
     
     def view_init(self, cr, uid, fields_list, context=None):
         """Override this method to do specific things when a view on the object is opened."""
@@ -4906,7 +4876,35 @@ class BaseModel(object):
     # backwards compatibility
     get_xml_id = get_external_id
     _get_xml_ids = _get_external_ids
-
+    
+    def get_needaction_info(self, cr, uid, user_id, limit=None, order=None, domain=False, context=None):
+        """Base method for needaction mechanism
+           - see ir.needaction for actual implementation
+           - if the model uses the need action mechanism
+             (hasattr(model_obj, 'needaction_get_record_ids')):
+              - get the record ids on which the user has actions to perform
+              - evaluate the menu domain
+              - compose a new domain: menu domain, limited to ids of
+                records requesting an action
+              - count the number of records maching that domain, that
+                is the number of actions the user has to perform
+           - this method returns default values
+           :param: model_name: the name of the model (ex: hr.holidays)
+           :param: user_id: the id of user
+           :return: [uses_needaction=True/False, needaction_uid_ctr=%d]
+        """
+        if hasattr(self, 'needaction_get_record_ids'):
+            ids = self.needaction_get_record_ids(cr, uid, user_id, limit=8192, context=context)
+            if not ids:
+                return (True, 0, [])
+            if domain:
+                new_domain = eval(domain) + [('id', 'in', ids)]
+            else:
+                new_domain = [('id', 'in', ids)]
+            return (True, self.search(cr, uid, new_domain, limit=limit, order=order, count=True), ids)
+        else:
+            return (False, 0, [])
+            
     # Transience
     def is_transient(self):
         """ Return whether the model is transient.

From f8ad1d77e4c26890383566fa8949cf0b1102a7c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 3 Apr 2012 16:57:44 +0200
Subject: [PATCH 09/13] [DOC] Updated documentation.

bzr revid: tde@openerp.com-20120403145744-xxibrjlzhersfmkb
---
 doc/api/need_action_specs.rst           | 6 +++---
 openerp/addons/base/ir/ir_needaction.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/api/need_action_specs.rst b/doc/api/need_action_specs.rst
index 1be92586e7f..c5c44419362 100644
--- a/doc/api/need_action_specs.rst
+++ b/doc/api/need_action_specs.rst
@@ -1,14 +1,14 @@
 Need action mechanism
 =====================
 
-base.needaction mixin class
-+++++++++++++++++++++++++++
+ir.needaction mixin class
+++++++++++++++++++++++++++
 
 This revision adds a mixin class for objects using the need action feature.
 
 Need action feature can be used by objects willing to be able to signal that an action is required on a particular record. If in the business logic an action must be performed by somebody, for instance validation by a manager, this mechanism allows to set a list of users asked to perform an action.
 
-This class wraps a table (base.needaction_users_rel) that behaves like a many2many field. However, no field is added to the model inheriting from base.needaction. The mixin class manages the low-level considerations of updating relationships. Every change made on the record calls a method that updates the relationships.
+This class wraps a class (ir.needaction_users) that behaves like a many2many field. However, no field is added to the model inheriting from base.needaction. The mixin class manages the low-level considerations of updating relationships. Every change made on the record calls a method that updates the relationships.
 
 Objects using the need_action feature should override the ``get_needaction_user_ids`` method. This methods returns a dictionary whose keys are record ids, and values a list of user ids, like in a many2many relationship. Therefore by defining only one method, you can specify if an action is required by defining the users that have to do it, in every possible situation.
 
diff --git a/openerp/addons/base/ir/ir_needaction.py b/openerp/addons/base/ir/ir_needaction.py
index ae13cc40900..391a0c2e3ff 100644
--- a/openerp/addons/base/ir/ir_needaction.py
+++ b/openerp/addons/base/ir/ir_needaction.py
@@ -92,7 +92,7 @@ class ir_needaction(osv.osv):
     validation by a manager, this mechanism allows to set a list of
     users asked to perform an action.
     
-    This class wraps a table (ir.needaction_users) that behaves
+    This class wraps a class (ir.needaction_users) that behaves
     like a many2many field. However, no field is added to the model
     inheriting from base.needaction. The mixin class manages the low-level
     considerations of updating relationships. Every change made on the

From a7c8c8d6aef2f3043cb7978ae18d90aba09953be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 3 Apr 2012 17:49:41 +0200
Subject: [PATCH 10/13] [DOC] Updated doc and comments

bzr revid: tde@openerp.com-20120403154941-0h83ws1av3clhxg4
---
 doc/api/need_action_specs.rst           | 4 ++--
 openerp/addons/base/ir/ir_needaction.py | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/doc/api/need_action_specs.rst b/doc/api/need_action_specs.rst
index c5c44419362..c9f32dd60c4 100644
--- a/doc/api/need_action_specs.rst
+++ b/doc/api/need_action_specs.rst
@@ -13,7 +13,7 @@ This class wraps a class (ir.needaction_users) that behaves like a many2many fie
 Objects using the need_action feature should override the ``get_needaction_user_ids`` method. This methods returns a dictionary whose keys are record ids, and values a list of user ids, like in a many2many relationship. Therefore by defining only one method, you can specify if an action is required by defining the users that have to do it, in every possible situation.
 
 This class also offers several global services,:
- - ``needaction_get_record_ids``: for a given model_name and uid, get all record ids that ask this user to perform an action. This mechanism is used for instance to display the number of pending actions in menus, such as Leads (12)
+ - ``needaction_get_record_ids``: for the current model and uid, get all record ids that ask this user to perform an action. This mechanism is used for instance to display the number of pending actions in menus, such as Leads (12)
  - ``needaction_get_action_count``: as ``needaction_get_record_ids`` but returns only the number of action, not the ids (performs a search with count=True)
  - ``needaction_get_user_record_references``: for a given uid, get all the records that ask this user to perform an action. Records are given as references, a list of tuples (model_name, record_id)
 
@@ -25,7 +25,7 @@ This revision adds three functional fields to ``ir.ui.menu`` model :
  - ``needaction_uid_ctr``: integer field. If the target model uses the need action mechanism, this field gives the number of actions the current user has to perform.
  - ``needaction_record_ids``: many2many field. If the target model uses the need action mechanism, this field holds the ids of the record requesting the user to perform an action.
 
-Those fields are functional, because they must be recalculated for each user, and each time menus are displayed. ``needaction_uid_ctr`` takes into account the domain of the action, in order to display accurate numbers.
+Those fields are functional, because they depend on the user and must therefore be computed at every refresh, each time menus are displayed. The use of the need action mechanism is done by taking into account the action domain in order to display accurate results. When computing the value of the functional fields, the ids of records asking the user to perform an action is concatenated to the action domain. A counting search is then performed on the model, giving back the number of action the users has to perform, limited to the domain of the action.
 
 Addon implementation example
 ++++++++++++++++++++++++++++
diff --git a/openerp/addons/base/ir/ir_needaction.py b/openerp/addons/base/ir/ir_needaction.py
index 391a0c2e3ff..db4ce5b11ff 100644
--- a/openerp/addons/base/ir/ir_needaction.py
+++ b/openerp/addons/base/ir/ir_needaction.py
@@ -83,7 +83,7 @@ class ir_needaction_users(osv.osv):
         return True
 
 
-class ir_needaction(osv.osv):
+class ir_needaction_mixin(osv.osv):
     '''Mixin class for objects using the need action feature.
     
     Need action feature can be used by objects willing to be able to
@@ -106,7 +106,7 @@ class ir_needaction(osv.osv):
     that have to do it, in every possible situation.
     
     This class also offers several global services,:
-    - ``needaction_get_record_ids``: for a given model_name and uid, get
+    - ``needaction_get_record_ids``: for the current model and uid, get
       all record ids that ask this user to perform an action. This
       mechanism is used for instance to display the number of pending
       actions in menus, such as Leads (12)
@@ -117,7 +117,7 @@ class ir_needaction(osv.osv):
       the records that ask this user to perform an action. Records
       are given as references, a list of tuples (model_name, record_id)
     '''
-    _name = 'ir.needaction'
+    _name = 'ir.ir_needaction_mixin'
     _description = 'Need action of users on records API'
     
     #------------------------------------------------------
@@ -125,6 +125,9 @@ class ir_needaction(osv.osv):
     #------------------------------------------------------
     
     def get_needaction_user_ids(self, cr, uid, ids, context=None):
+        """ Returns the user_ids that have to perform an action
+            :return: dict { record_id: [user_ids], }
+        """
         return dict.fromkeys(ids, [])
     
     def create(self, cr, uid, values, context=None):

From 90e1433157bbed97641b026fddb97e270a78f358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 3 Apr 2012 18:07:25 +0200
Subject: [PATCH 11/13] [IMP] Removed unused import; added forgottent context
 to search.

bzr revid: tde@openerp.com-20120403160725-lprixelmtx5cq87l
---
 openerp/osv/orm.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index a59ecb941ff..81fc9b81976 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -57,7 +57,6 @@ from lxml import etree
 import fields
 import openerp
 import openerp.netsvc as netsvc
-import openerp.pooler as pooler
 import openerp.tools as tools
 from openerp.tools.config import config
 from openerp.tools.safe_eval import safe_eval as eval
@@ -4901,7 +4900,7 @@ class BaseModel(object):
                 new_domain = eval(domain) + [('id', 'in', ids)]
             else:
                 new_domain = [('id', 'in', ids)]
-            return (True, self.search(cr, uid, new_domain, limit=limit, order=order, count=True), ids)
+            return (True, self.search(cr, uid, new_domain, limit=limit, order=order, count=True, context=context), ids)
         else:
             return (False, 0, [])
             

From 1ba19a0f50cf8126b993c5427dff9703ebbf4914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 3 Apr 2012 18:29:16 +0200
Subject: [PATCH 12/13] [FIX] Wrong class name

bzr revid: tde@openerp.com-20120403162916-lm58en1xu9zyv0co
---
 openerp/addons/base/ir/ir_needaction.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_needaction.py b/openerp/addons/base/ir/ir_needaction.py
index db4ce5b11ff..6f1e07787c6 100644
--- a/openerp/addons/base/ir/ir_needaction.py
+++ b/openerp/addons/base/ir/ir_needaction.py
@@ -117,7 +117,7 @@ class ir_needaction_mixin(osv.osv):
       the records that ask this user to perform an action. Records
       are given as references, a list of tuples (model_name, record_id)
     '''
-    _name = 'ir.ir_needaction_mixin'
+    _name = 'ir.needaction_mixin'
     _description = 'Need action of users on records API'
     
     #------------------------------------------------------

From cffec497857cdd569e65b64c6b2096c6c8f5f986 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 3 Apr 2012 18:41:27 +0200
Subject: [PATCH 13/13] [FIX] Propagated class name change

bzr revid: tde@openerp.com-20120403164127-5dy7ors0vm5u7zzi
---
 openerp/addons/base/ir/ir_needaction.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/ir/ir_needaction.py b/openerp/addons/base/ir/ir_needaction.py
index 6f1e07787c6..3fcd56affae 100644
--- a/openerp/addons/base/ir/ir_needaction.py
+++ b/openerp/addons/base/ir/ir_needaction.py
@@ -135,7 +135,7 @@ class ir_needaction_mixin(osv.osv):
             context = {}
         needact_table_obj = self.pool.get('ir.needaction_users')
         # perform create
-        obj_id = super(ir_needaction, self).create(cr, uid, values, context=context)
+        obj_id = super(ir_needaction_mixin, self).create(cr, uid, values, context=context)
         # link user_ids
         needaction_user_ids = self.get_needaction_user_ids(cr, uid, [obj_id], context=context)
         needact_table_obj.create_users(cr, uid, [obj_id], self._name, needaction_user_ids[obj_id], context=context)
@@ -146,7 +146,7 @@ class ir_needaction_mixin(osv.osv):
             context = {}
         needact_table_obj = self.pool.get('ir.needaction_users')
         # perform write
-        write_res = super(ir_needaction, self).write(cr, uid, ids, values, context=context)
+        write_res = super(ir_needaction_mixin, self).write(cr, uid, ids, values, context=context)
         # get and update user_ids
         needaction_user_ids = self.get_needaction_user_ids(cr, uid, ids, context=context)
         for id in ids:
@@ -160,7 +160,7 @@ class ir_needaction_mixin(osv.osv):
         needact_table_obj = self.pool.get('ir.needaction_users')
         needact_table_obj.unlink_users(cr, uid, ids, self._name, context=context)
         # perform unlink
-        return super(ir_needaction, self).unlink(cr, uid, ids, context=context)
+        return super(ir_needaction_mixin, self).unlink(cr, uid, ids, context=context)
     
     #------------------------------------------------------
     # Need action API