From b9beb3076e7d838960abf20dcf904586a533e6c5 Mon Sep 17 00:00:00 2001
From: "RGA (OpenERP)" <rga@tinyerp.com>
Date: Mon, 20 Sep 2010 14:40:37 +0530
Subject: [PATCH 1/5] [IMP]when create new filter it should be modified if same
 name filter already exist otherwise create new one

bzr revid: rga@tinyerp.com-20100920091037-tyheqqfx72b3cbm2
---
 bin/addons/base/ir/ir_filters.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/bin/addons/base/ir/ir_filters.py b/bin/addons/base/ir/ir_filters.py
index 2821d0c94b7..272d1c718c1 100644
--- a/bin/addons/base/ir/ir_filters.py
+++ b/bin/addons/base/ir/ir_filters.py
@@ -36,6 +36,20 @@ class ir_filters(osv.osv):
         act_ids = self.search(cr,uid,[('model_id','=',model),('user_id','=',uid)])
         my_acts = self.read(cr, uid, act_ids, ['name', 'domain','context'])
         return my_acts
+    
+    def create_or_replace(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        is_filter_exist = False
+        for filter in self.get_filters(cr, uid, vals['model_id']):
+            if filter['name'].lower() == vals['name'].lower():
+                is_filter_exist = filter['id']
+                break
+        if is_filter_exist:
+             return super(ir_filters, self).write(cr, uid, is_filter_exist, vals, context)
+        else:
+             return super(ir_filters, self).create(cr, uid, vals, context)
+
 
     _columns = {
         'name': fields.char('Action Name', size=64, translate=True, required=True),

From 9b0e0fa9d834c26fa93c97d92b727eae231a669b Mon Sep 17 00:00:00 2001
From: "RGA (OpenERP)" <rga@tinyerp.com>
Date: Wed, 29 Sep 2010 13:07:41 +0530
Subject: [PATCH 2/5] Add UNIQUE constraint in ir.filters + refactor code

bzr revid: rga@tinyerp.com-20100929073741-kpnvws23uvj3g00e
---
 bin/addons/base/ir/ir_filters.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/bin/addons/base/ir/ir_filters.py b/bin/addons/base/ir/ir_filters.py
index 272d1c718c1..c9cdf16d31e 100644
--- a/bin/addons/base/ir/ir_filters.py
+++ b/bin/addons/base/ir/ir_filters.py
@@ -38,17 +38,14 @@ class ir_filters(osv.osv):
         return my_acts
     
     def create_or_replace(self, cr, uid, vals, context=None):
-        if context is None:
-            context = {}
-        is_filter_exist = False
+        filter_id = None
         for filter in self.get_filters(cr, uid, vals['model_id']):
             if filter['name'].lower() == vals['name'].lower():
-                is_filter_exist = filter['id']
+                filter_id = filter['id']
                 break
-        if is_filter_exist:
-             return super(ir_filters, self).write(cr, uid, is_filter_exist, vals, context)
-        else:
-             return super(ir_filters, self).create(cr, uid, vals, context)
+        if filter_id:
+            return self.write(cr, uid, filter_id, vals, context)
+        return self.create(cr, uid, vals, context)
 
 
     _columns = {
@@ -58,6 +55,11 @@ class ir_filters(osv.osv):
         'context': fields.text('Context Value', required=True),
         'model_id': fields.selection(_list_all_models, 'Model', required=True),
     }
+    
+    _sql_constraints = [
+        ('name_model_uid_uniq', 'UNIQUE(name, model_id, user_id)', 'Filter name must be unique!'),
+    ]
+
 
 ir_filters()
 

From 5afbd9c6635ef08ba44cb9130997ce4e5326444d Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 6 Oct 2010 14:58:07 +0530
Subject: [PATCH 3/5] [MOD] Survey : Improvements in access rights

bzr revid: vir@tinyerp.com-20101006092807-yctppi8ub7t8jx8s
---
 addons/survey/security/ir.model.access.csv | 28 +++++++++++++++++-----
 addons/survey/survey_view.xml              | 15 ++++++------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv
index 5d4501e36bd..b44d52c6c08 100644
--- a/addons/survey/security/ir.model.access.csv
+++ b/addons/survey/security/ir.model.access.csv
@@ -1,17 +1,33 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_survey_type_user","survey.type user","model_survey_type","base.group_tool_user",1,1,1,1
-"access_survey_user","survey","model_survey","base.group_tool_user",1,1,1,1
+"access_survey_res_partner_manager","survey.res.partner.manager","base.model_res_partner","base.group_tool_manager",1,1,1,1
+"access_survey_type_manager","survey.type.manager","model_survey_type","base.group_tool_manager",1,1,1,1
+"access_survey_manager","survey.manager","model_survey","base.group_tool_manager",1,1,1,1
+"access_survey_page_manager","survey.page manager","model_survey_page","base.group_tool_manager",1,1,1,1
+"access_survey_question_manager","survey.question manager","model_survey_question","base.group_tool_manager",1,1,1,1
+"access_survey_answer_manager","survey.answer manager","model_survey_answer","base.group_tool_manager",1,1,1,1
+"access_survey_response_manager","survey.response manager","model_survey_response","base.group_tool_manager",1,1,1,1
+"access_survey_response_answer_manager","survey.response.answer manager","model_survey_response_answer","base.group_tool_manager",1,1,1,1
+"access_survey_history_manager","survey.history.manager","model_survey_history","base.group_tool_manager",1,1,1,1
+"access_survey_question_column_heading_manager","survey.question.column.heading manager","model_survey_question_column_heading","base.group_tool_manager",1,1,1,1
+"access_survey_request_manager","survey.request manager","model_survey_request","base.group_tool_manager",1,1,1,1
+"access_survey_tbl_column_heading_manager","survey.tbl.column.heading manager","model_survey_tbl_column_heading","base.group_tool_manager",1,1,1,1
+"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_tool_manager",1,1,1,1
+"access_survey_res_partner_address_manager","survey.res.partner.address.manager","base.model_res_partner_address","base.group_tool_manager",1,1,1,0
+"access_survey_res_partner_manager","survey.res.partner.manager","base.model_res_partner","base.group_tool_manager",1,1,1,1
+"access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_user",1,1,1,1
+"access_survey_type_user","survey.type.user","model_survey_type","base.group_tool_user",1,1,1,1
+"access_survey_user","survey.user","model_survey","base.group_tool_user",1,1,1,1
 "access_survey_page_user","survey.page user","model_survey_page","base.group_tool_user",1,1,1,1
 "access_survey_question_user","survey.question user","model_survey_question","base.group_tool_user",1,1,1,1
 "access_survey_answer_user","survey.answer user","model_survey_answer","base.group_tool_user",1,1,1,1
 "access_survey_response_user","survey.response user","model_survey_response","base.group_tool_user",1,1,1,1
 "access_survey_response_answer_user","survey.response.answer user","model_survey_response_answer","base.group_tool_user",1,1,1,1
 "access_survey_history_user","survey.history.user","model_survey_history","base.group_tool_user",1,1,1,1
-"access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_tool_user",1,0,0,0
-"access_survey_request_user","survey.request user","model_survey_request","base.group_tool_user",1,1,1,1
+"access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_tool_user",1,1,1,1
 "access_survey_tbl_column_heading_user","survey.tbl.column.heading user","model_survey_tbl_column_heading","base.group_tool_user",1,1,1,1
 "access_survey_response_line_user","survey.response.line user","model_survey_response_line","base.group_tool_user",1,1,1,1
 "access_survey_res_partner_address_user","survey.res.partner.address.user","base.model_res_partner_address","base.group_tool_user",1,1,1,0
+"access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_user",1,1,1,1
 "access_survey_survey_user","survey.survey.user","model_survey","group_survey_user",1,1,1,1
 "access_survey_type_survey_user","survey.type.survey.user","model_survey_type","group_survey_user",1,1,1,1
 "access_survey_page_survey_user","survey.page.survey.user","model_survey_page","group_survey_user",1,1,1,1
@@ -24,5 +40,5 @@
 "access_survey_question_column_heading_survey_user","survey.question.column.heading.survey.user","model_survey_question_column_heading","group_survey_user",1,0,0,0
 "access_survey_tbl_column_heading_survey_user","survey.tbl.column.heading.survey.user","model_survey_tbl_column_heading","group_survey_user",1,1,1,1
 "access_survey_response_line_survey_user","survey.response.line.survey.user","model_survey_response_line","group_survey_user",1,1,1,1
-"access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_manager",1,1,1,1
-
+"access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_user",1,1,1,0
+"access_survey_res_partner_address_user","survey.res.partner.address.user","base.model_res_partner_address","base.group_tool_user",1,1,1,0
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index b6cc394ad8a..576ef37885e 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -3,12 +3,11 @@
     <data>
 
             <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28"/>
-            <menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools"
-                        groups="base.group_tool_user,group_survey_user" sequence="2"/>
+            <menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools" sequence="2" groups="base.group_tool_user,base.group_tool_manager,group_survey_user"/>
             <menuitem name="Define Surveys" id="menu_define_survey"
-                 groups="base.group_tool_user,group_survey_user"
+                 groups="base.group_tool_manager"
                  parent="menu_surveys" />
-            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_user,group_survey_user"/>
+            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_user,base.group_tool_manager,group_survey_user"/>
             <menuitem name="Reporting" parent="base.menu_tools"
                 id="base.menu_lunch_reporting" sequence="6"/>
             <menuitem name="Surveys" id="menu_reporting" parent="base.menu_lunch_reporting" sequence="2"/>
@@ -292,7 +291,7 @@
 
         <menuitem name="Surveys" id="menu_survey_form"
             action="action_survey_form1" parent="menu_define_survey"
-            groups="base.group_tool_user,group_survey_user"/>
+            groups="base.group_tool_manager"/>
 
         <!--
             Survey Pages
@@ -492,7 +491,7 @@
 
         <menuitem name="Survey Pages" id="menu_survey_page_form1"
             action="action_survey_page_form" parent='menu_define_survey'
-            groups="base.group_tool_user,group_survey_user"/>
+            groups="base.group_tool_manager"/>
 
         <record model="ir.ui.view" id="survey_page_wizard_test1">
             <field name="name">survey_page_wizard_test</field>
@@ -1126,7 +1125,7 @@
 
         <menuitem name="Survey Requests" id="menu_survey_type_form1"
             action="action_survey_request_tree" parent='menu_answer_surveys'
-            groups="base.group_tool_user,group_survey_user"/>
+            groups="base.group_tool_manager"/>
 
         <!--
             Survey Type
@@ -1193,7 +1192,7 @@
             src_model="survey.question"/>
 
         <menuitem name="Answer a Survey" id="menu_run_survey_form" sequence="2"
-            action="action_view_survey_name" parent="menu_answer_surveys"            groups="base.group_tool_user,group_survey_user" icon="STOCK_INDEX"/>
+            action="action_view_survey_name" parent="menu_answer_surveys"            groups="base.group_tool_user,base.group_tool_manager,group_survey_user" icon="STOCK_INDEX"/>
 
     </data>
 </openerp>

From ef28e951f503fc2bef3003690d288d379dff5d81 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 6 Oct 2010 15:01:47 +0530
Subject: [PATCH 4/5] [MOD/IMP] hr : Usability Improvenment in Accessrights

bzr revid: dbr@tinyerp.com-20101006093147-xaqdyfd23izwtfmm
---
 addons/hr/hr_department_view.xml              |  2 +-
 addons/hr/hr_view.xml                         | 10 ++++----
 addons/hr/security/ir.model.access.csv        | 23 ++++++++-----------
 .../report/holidays_summary_report.py         |  1 -
 .../wizard/hr_holidays_summary_department.py  |  1 -
 .../hr_holidays_summary_department_view.xml   |  1 -
 6 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index c80c0cd91d4..3e02c3e539c 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -67,7 +67,7 @@
             <field name="help">Your Company's Departments Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitements, etc.</field>
         </record>
 
-       <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_management" sequence="6"/>
+       <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_management" sequence="6" groups="base.group_user"/>
 
        <record model="ir.ui.view" id="view_users_form_inherit">
             <field name="name">res.users.form</field>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 496e24bbb08..628f631351d 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -4,9 +4,9 @@
 
         <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"/>
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
-        <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_system" sequence="50"/>
+        <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
         <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="1"/>
-        <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" groups="base.group_system" name="Employees" sequence="1" />
+        <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" groups="base.group_hr_manager" name="Employees" sequence="1" />
 
         <!--
         ==========
@@ -151,7 +151,7 @@
             <field name="help">The employee directory contains all data related to your employees : from their photo up to their hourly estimated costs for the timesheets.Employees are managed by departments and can be linked to users to manage their access rights.</field>
         </record>
 
-        <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main" groups="base.group_system,base.group_hr_manager,base.group_hr_user"/>
+        <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main" groups="base.group_hr_manager,base.group_hr_user,base.group_user"/>
 
         <!--
         =======================
@@ -284,7 +284,7 @@
         </record>
 
         <menuitem action="open_view_categ_form" id="menu_view_employee_category_form"
-            parent="menu_view_employee_category_configuration_form" sequence="1" groups="base.group_extended"/>
+            parent="menu_view_employee_category_configuration_form" sequence="1" groups="base.group_extended,base.group_user"/>
 
         <record id="open_view_categ_tree" model="ir.actions.act_window">
             <field name="name">Categories structure</field>
@@ -399,7 +399,7 @@
             <field name="help">Job Positions are used to define the jobs, the requirements. You can attach a survey to a job position. This survey will be used in the recruitement process to evaluate the applicants for this job position.</field>
         </record>
 
-        <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root" groups="base.group_hr_manager,base.group_system"/>
+        <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root" groups="base.group_hr_manager"/>
         <menuitem parent="base.menu_crm_case_job_req_main" id="menu_hr_job" action="action_hr_job" sequence="2"/>
 
     </data>
diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
index a9fb4fdaae3..4f29f004c50 100644
--- a/addons/hr/security/ir.model.access.csv
+++ b/addons/hr/security/ir.model.access.csv
@@ -1,20 +1,15 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_employee_category_user","hr.employee.category.user","model_hr_employee_category","base.group_hr_user",1,0,0,0
+"access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","base.group_hr_manager",1,1,1,1
+"access_hr_employee_category_employee","hr.employee.category.employee","model_hr_employee_category","base.group_user",1,0,0,0
+"access_hr_employee_employee","hr.employee.employee","model_hr_employee","base.group_user",1,0,0,0
 "access_hr_employee_user","hr.employee user","model_hr_employee","base.group_hr_user",1,1,1,1
 "access_hr_employee_resource_user","resource.resource.user","resource.model_resource_resource","base.group_hr_user",1,1,1,1
-"access_hr_department_user","hr.department.user","model_hr_department","base.group_hr_user",1,1,1,1
-"access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","base.group_hr_manager",1,1,1,1
-"access_hr_department_manager","hr.department.manager","model_hr_department","base.group_hr_manager",1,1,1,1
-"access_hr_employee_marital_status","hr.employee.marital.status","model_hr_employee_marital_status","base.group_system",1,1,1,1
-"access_hr_job_user","hr.job user","model_hr_job","base.group_hr_user",1,0,0,0
-"access_hr_employee_category_system","hr.employee.category.system","model_hr_employee_category","base.group_system",1,1,1,1
-"access_hr_employee_manager","hr.employee.manager","model_hr_employee","base.group_hr_manager",1,1,1,1
 "access_hr_employee_resource_manager","resource.resource.manager","resource.model_resource_resource","base.group_hr_manager",1,1,1,1
-"access_hr_department_system","hr.department.system","model_hr_department","base.group_system",1,1,1,1
-"access_hr_res_partner_address","res.partner.address","base.model_res_partner_address","base.group_hr_manager",1,1,1,1
-"access_hr_job_manager","hr.job.manager","model_hr_job","base.group_hr_manager",1,1,1,1
-"access_hr_employee_system","hr.employee.system","model_hr_employee","base.group_system",1,0,0,0
-"access_hr_job_system","hr.job system","model_hr_job","base.group_system",1,0,0,0
-"access_hr_employee_employee","hr.employee.employee","model_hr_employee","base.group_user",1,0,0,0
-"access_hr_employee_category_employee","hr.employee.category.employee","model_hr_employee_category","base.group_user",1,0,0,0
+"access_hr_department_user","hr.department.user","model_hr_department","base.group_hr_user",1,1,1,1
 "access_hr_department_employee","hr.department.employee","model_hr_department","base.group_user",1,0,0,0
+"access_hr_department_manager","hr.department.manager","model_hr_department","base.group_hr_manager",1,1,1,1
+"access_hr_job_user","hr.job user","model_hr_job","base.group_hr_user",1,0,0,0
+"access_hr_job_manager","hr.job.manager","model_hr_job","base.group_hr_manager",1,1,1,1
+"access_hr_res_partner_address","res.partner.address","base.model_res_partner_address","base.group_hr_manager",1,1,1,1
+"access_hr_employee_marital_status_manager","hr.employee.marital.status.manager","model_hr_employee_marital_status","base.group_hr_manager",1,1,1,1
diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py
index a14970b31e5..92dedd1a14d 100644
--- a/addons/hr_holidays/report/holidays_summary_report.py
+++ b/addons/hr_holidays/report/holidays_summary_report.py
@@ -100,7 +100,6 @@ class report_custom(report_rml):
         today=datetime.datetime.today()
 
         first_date=data['form']['date_from']
-
         som = strToDate(first_date)
         eom = som+datetime.timedelta(59)
         day_diff=eom-som
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department.py b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
index a7c0d274194..4409254c16e 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
@@ -29,7 +29,6 @@ class hr_holidays_summary_dept(osv.osv_memory):
     _description = 'HR Holidays Summary Report By Department'
     _columns = {
         'date_from': fields.date('From', required=True),
-        'date_to': fields.date('To', required=True),
         'depts': fields.many2many('hr.department', 'summary_dept_rel', 'sum_id', 'dept_id', 'Department(s)'),
         'holiday_type': fields.selection([('Validated','Validated'),('Confirmed','Confirmed'),('both','Both Validated and Confirmed')], 'Select Holyday State', required=True)
     }
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
index ca8e7e75dcf..cd7665be123 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -10,7 +10,6 @@
 			<form string="Holidays by Department">
 			    <group col="4" colspan="6">
 				    <field name="date_from" />
-				    <field name="date_to" />
 				    <newline/>
 				    <field name="holiday_type" colspan="4"/>
 				    <newline/>

From d935a5d80efa93d9b79d61ce5c0b66e26111c47f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 6 Oct 2010 11:40:03 +0200
Subject: [PATCH 5/5] [IMP] ir.filters: improve create_or_replace() and make
 unique constraint case insensitive

bzr revid: odo@openerp.com-20101006094003-dlj24xrmotnbwvhv
---
 bin/addons/base/ir/ir_filters.py | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/bin/addons/base/ir/ir_filters.py b/bin/addons/base/ir/ir_filters.py
index c9cdf16d31e..541dbdb60c6 100644
--- a/bin/addons/base/ir/ir_filters.py
+++ b/bin/addons/base/ir/ir_filters.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from osv import osv, fields
+from tools.translate import _
 
 class ir_filters(osv.osv):
     '''
@@ -36,30 +37,31 @@ class ir_filters(osv.osv):
         act_ids = self.search(cr,uid,[('model_id','=',model),('user_id','=',uid)])
         my_acts = self.read(cr, uid, act_ids, ['name', 'domain','context'])
         return my_acts
-    
+
     def create_or_replace(self, cr, uid, vals, context=None):
         filter_id = None
-        for filter in self.get_filters(cr, uid, vals['model_id']):
-            if filter['name'].lower() == vals['name'].lower():
-                filter_id = filter['id']
-                break
-        if filter_id:
-            return self.write(cr, uid, filter_id, vals, context)
+        lower_name = vals['name'].lower()
+        matching_filters = [x for x in self.get_filters(cr, uid, vals['model_id'])
+                                if x['name'].lower() == lower_name]
+        if matching_filters:
+            self.write(cr, uid, matching_filters[0]['id'], vals, context)
+            return False
         return self.create(cr, uid, vals, context)
 
+    def _auto_init(self, cr, context={}):
+        super(ir_filters, self)._auto_init(cr, context)
+        # Use unique index to implement unique constraint on the lowercase name (not possible using a constraint)
+        cr.execute("SELECT indexname FROM pg_indexes WHERE indexname = 'ir_filters_name_model_uid_unique_index'")
+        if not cr.fetchone():
+            cr.execute('CREATE UNIQUE INDEX "ir_filters_name_model_uid_unique_index" ON ir_filters (lower(name), model_id, user_id)')
 
     _columns = {
         'name': fields.char('Action Name', size=64, translate=True, required=True),
         'user_id':fields.many2one('res.users', 'User', help='False means for every user'),
         'domain': fields.text('Domain Value', required=True),
         'context': fields.text('Context Value', required=True),
-        'model_id': fields.selection(_list_all_models, 'Model', required=True),
+        'model_id': fields.selection(_list_all_models, 'Object', required=True),
     }
-    
-    _sql_constraints = [
-        ('name_model_uid_uniq', 'UNIQUE(name, model_id, user_id)', 'Filter name must be unique!'),
-    ]
-
 
 ir_filters()