odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE]:lp:~openerp-dev/openobject-addons/trunk-form-add-topbar-apa-survey-mma 

bzr revid: apa@tinyerp.com-20120504115645-h8ohrewvd120i874
This commit is contained in:
Amit Patel (OpenERP) 2012-05-04 17:26:45 +05:30
parent 225eb4f1c8 16d26ec647
commit 67e7989db0
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/survey/survey.py
View File

@ -702,7 +702,7 @@ class survey_request(osv.osv):
'email': fields.char("E-mail", size=64),
'survey_id': fields.many2one("survey", "Survey", required=1, ondelete='cascade'),
'response': fields.many2one('survey.response', 'Answer'),
'state': fields.selection([('draft','Draft'),('waiting_answer', 'Waiting Answer'),('done', 'Done'),('cancel', 'Cancelled')], 'State', readonly=1)
'state': fields.selection([('draft','Draft'),('cancel', 'Cancelled'),('waiting_answer', 'Waiting Answer'),('done', 'Done')], 'State', readonly=1)
}
_defaults = {
'state': lambda * a: 'draft',

20
addons/survey/survey_view.xml
View File

@ -1058,18 +1058,24 @@
<field name="model">survey.request</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Survey Request">
<form layout="manual">
<div class="oe_form_topbar">
<button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" icon="gtk-new"/>
<button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object" icon="gtk-new"/>
<button name="survey_req_done" string="Done" states="waiting_answer" type="object" icon="gtk-ok"/>
<button name="survey_req_cancel" string="Cancel" states="waiting_answer" type="object" icon="gtk-cancel"/>
<div class="oe_right">
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,waiting_answer"/>
</div>
</div>
<sheet string="Survey Request" layout="auto">
<group class="oe_form_header">
<field name="date_deadline"/>
<field name="survey_id"/>
<field name="user_id" on_change="on_change_user(user_id)"/>
<field name="response" readonly="1"/>
<group colspan="4" col="6">
<field name="state"/>
<button name="survey_req_cancel" string="Cancelled" states="waiting_answer" type="object" icon="gtk-cancel"/>
<button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" icon="gtk-new"/>
<button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object" icon="gtk-new"/>
<button name="survey_req_done" string="Done" states="waiting_answer" type="object" icon="gtk-ok"/>
</group>
</sheet>
</form>
</field>
</record>