[MERGE]: lp:trunk-dev-addons2

bzr revid: rvo@tinyerp.co.in-20100918062608-gddpu7210ynvvuz4

3 files changed, 9 insertions, 5 deletions

diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv
index 10c07dc0b08..9d7c9c44ee4 100644
--- a/addons/survey/security/ir.model.access.csv
+++ b/addons/survey/security/ir.model.access.csv
@@ -24,7 +24,7 @@
 "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_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_manager","survey.response.line manager","model_survey_response_line","base.group_tool_manager",1,1,1,1
-"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","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_type","survey.type","model_survey_type","base.group_hr_manager",1,1,1,1
 "access_survey","survey","model_survey","base.group_hr_manager",1,1,1,1
 "access_survey_history_manager","survey.history","model_survey_history","base.group_hr_manager",1,1,1,1
@@ -44,4 +44,8 @@
 "access_survey_history_system","survey.history.system","model_survey_history","base.group_system",1,0,0,0
 "access_survey_answer_system","survey.answer system","model_survey_answer","base.group_system",1,0,0,0
 "access_survey_answer_base_user","survey.answer.base.user","model_survey_answer","base.group_user",1,1,1,1
-"access_survey_question_base_user","survey.question.base.user","model_survey_question","base.group_user",1,1,1,
+"access_survey_question_base_user","survey.question.base.user","model_survey_question","base.group_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_request_employee","survey.request.employee","model_survey_request","base.group_user",1,0,0,0
+"access_survey_response_employee","survey.response employee","model_survey_response","base.group_user",1,0,0,0
+"access_survey_employee","survey.employee","model_survey","base.group_user",1,0,0,0
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index d1d392c5479..61d96f792f8 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -60,7 +60,7 @@ class survey(osv.osv):
         'response_user': fields.integer('Maximum Answer per User',
                      help="Set to one if  you require only one Answer per user"),
         'state': fields.selection([('draft', 'Draft'), ('open', 'Open'), ('close', 'Closed'), ('cancel', 'Cancelled')], 'Status', readonly=True),
-        'responsible_id': fields.many2one('res.users', 'Responsible'),
+        'responsible_id': fields.many2one('res.users', 'Responsible', help="User responsible for survey"),
         'tot_start_survey': fields.integer("Total Started Survey", readonly=1),
         'tot_comp_survey': fields.integer("Total Completed Survey", readonly=1),
         'note': fields.text('Description', size=128),
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index ec3b1677db6..2aa3eac089d 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -476,7 +476,6 @@
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20">
                         <filter string="Survey" icon="terp-stock_align_left_24" domain="[]"  context="{'group_by':'survey_id'}"/>
-                        <filter string="Page" icon="terp-stock_align_left_24" domain="[]"  context="{'group_by':'title'}"/>                        
                     </group>
                 </search>
             </field>
@@ -1106,7 +1105,7 @@
                     <group expand="0" string="Group By..." colspan="4" col="20">
 	                    <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
-	                    <filter string="Survey" icon="terp-stock_symbol-selection" domain="[]"  context="{'group_by':'survey_id'}"/>
+	                    <filter string="Survey" icon="terp-stock_align_left_24" domain="[]"  context="{'group_by':'survey_id'}"/>
                         <separator orientation="vertical"/>
 	                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
                     </group>
@@ -1119,6 +1118,7 @@
             <field name="res_model">survey.request</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="domain">[('user_id','=',uid)]</field>
             <field name="view_id" ref="survey_request_tree"></field>
             <field name="search_view_id" ref="survey_request_search"/>
         </record>