pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] lp:~openerp-dev/openobject-addons/trunk-addons-issues4-survey-pso

Browse Source 
bzr revid: stw@openerp.com-20120810100513-35f25v8rz3ynwbrv
This commit is contained in:
Stephane Wirtel
2012-08-10 12:05:13 +02:00
parent b01fc5c9a2 4bf04e1476
commit 8f028c4cd0
5 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/survey/survey_view.xml
+15 -13
View File
@@ -3,13 +3,11 @@
<data>
<menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools" sequence="2" groups="base.group_tool_user,base.group_tool_manager,base.group_survey_user"/>
<menuitem name="Define Surveys" id="menu_define_survey"
groups="base.group_tool_manager"
parent="menu_surveys" />
<menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_user,base.group_tool_manager,base.group_survey_user"/>
<menuitem name="Reporting" parent="base.menu_tools"
id="base.menu_lunch_reporting" sequence="6"/>
<menuitem name="Reporting" id="menu_reporting" parent="menu_surveys" sequence="60"/>
<menuitem id="base.next_id_10" name="Survey" parent="base.menu_reporting" sequence="1" />
<!--
Survey
@@ -314,7 +312,7 @@
</ul>
</div>
<div class="oe_kanban_content">
<h3 class="oe_kanban_ellipsis"><t t-esc="record.title.raw_value.toString()"><field name="title"/></t></h3>
<h3 class="oe_kanban_ellipsis"><t t-esc="record.title.raw_value.toString()"></t></h3>
<div class="oe_survey_responsible">
<t t-if="record.responsible_id.raw_value">By: <field name="responsible_id"/></t>
</div><br/>
@@ -361,8 +359,8 @@
<menuitem name="Surveys" id="menu_survey_form"
action="action_survey_form1" parent="menu_define_survey"
groups="base.group_tool_manager"/>
action="action_survey_form1" parent="menu_surveys"
groups="base.group_tool_manager" sequence="1"/>
<!--
Survey Pages
@@ -576,8 +574,8 @@
</record>
<menuitem name="Survey Pages" id="menu_survey_page_form1"
action="action_survey_page_form" parent='menu_define_survey'
groups="base.group_tool_manager"/>
action="action_survey_page_form" parent="menu_surveys"
groups="base.group_no_one"/>
<record model="ir.ui.view" id="survey_page_wizard_test1">
<field name="name">survey_page_wizard_test</field>
@@ -1210,8 +1208,8 @@
</record>
<menuitem name="Survey Requests" id="menu_survey_type_form1"
action="action_survey_request_tree" parent='menu_answer_surveys'
groups="base.group_tool_manager"/>
action="action_survey_request_tree" parent="menu_surveys"
groups="base.group_tool_manager" sequence="3"/>
<!--
Survey Type
@@ -1277,8 +1275,12 @@
res_model="survey.answer"
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,base.group_tool_manager,base.group_survey_user" icon="STOCK_INDEX"/>
<act_window
context="{'search_default_survey_id': active_id, 'default_survey_id': active_id}"
id="act_survey_request"
name="Survey Requests"
res_model="survey.request"
src_model="survey"/>
</data>
</openerp>
addons/survey/wizard/survey_browse_answer.xml
+1 -1
View File
@@ -36,7 +36,7 @@
</record>
<menuitem name="Browse Answers" id="menu_browse_survey_response"
action="action_browse_survey_response" parent="menu_reporting"
action="action_browse_survey_response" parent="base.next_id_10"
groups="base.group_tool_manager" icon="STOCK_PRINT_PREVIEW"/>
</data>
addons/survey/wizard/survey_print.xml
+1 -1
View File
@@ -39,7 +39,7 @@
</record>
<menuitem name="Print Surveys" id="menu_print_survey_form" sequence="1"
action="action_view_survey_print" parent="menu_reporting"
action="action_view_survey_print" parent="base.next_id_10"
groups="base.group_tool_manager" icon="STOCK_PRINT"/>
</data>
addons/survey/wizard/survey_print_answer.xml
+1 -1
View File
@@ -40,7 +40,7 @@
</record>
<menuitem name="Surveys Answers" action="action_view_survey_print_answer" id="menu_print_survey_answer"
parent="menu_reporting" icon="STOCK_PRINT" groups="base.group_tool_manager"/>
parent="base.next_id_10" icon="STOCK_PRINT" groups="base.group_tool_manager"/>
</data>
</openerp>
addons/survey/wizard/survey_print_statistics.xml
+1 -1
View File
@@ -32,7 +32,7 @@
</record>
<menuitem name="Surveys Statistics" action="action_view_survey_print_statistics" id="menu_print_survey_statistics"
parent="menu_reporting" icon="STOCK_PRINT" groups="base.group_tool_manager"/>
parent="base.next_id_10" icon="STOCK_PRINT" groups="base.group_tool_manager"/>
</data>
</openerp>