Priyesh (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons-issues4-survey-pso into
lp:openobject-addons.
Requested reviews:
Stephane Wirtel (OpenERP) (stephane-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons-issues4-survey-pso/+merge/118936
Hello,
Task: Addons-issues4
Improved survey module.
Kindly review it.
Thanks,
Priyesh
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons-issues4-survey-pso/+merge/118936
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons-issues4-survey-pso.
=== modified file 'survey/survey_view.xml'
--- survey/survey_view.xml 2012-08-04 14:35:56 +0000
+++ survey/survey_view.xml 2012-08-09 12:28:34 +0000
@@ -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>
=== modified file 'survey/wizard/survey_browse_answer.xml'
--- survey/wizard/survey_browse_answer.xml 2012-07-04 09:22:51 +0000
+++ survey/wizard/survey_browse_answer.xml 2012-08-09 12:28:34 +0000
@@ -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>
=== modified file 'survey/wizard/survey_print.xml'
--- survey/wizard/survey_print.xml 2012-06-29 08:46:03 +0000
+++ survey/wizard/survey_print.xml 2012-08-09 12:28:34 +0000
@@ -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>
=== modified file 'survey/wizard/survey_print_answer.xml'
--- survey/wizard/survey_print_answer.xml 2012-07-02 08:50:57 +0000
+++ survey/wizard/survey_print_answer.xml 2012-08-09 12:28:34 +0000
@@ -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>
=== modified file 'survey/wizard/survey_print_statistics.xml'
--- survey/wizard/survey_print_statistics.xml 2012-06-29 10:12:08 +0000
+++ survey/wizard/survey_print_statistics.xml 2012-08-09 12:28:34 +0000
@@ -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>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
