diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-03-15 12:43:38 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-03-15 12:43:38 +0100 |
| commit | 4484a3197ca558341ce595df41ffdc072a8d05d2 (patch) | |
| tree | 160895b3cd052ef5a0661ed2ee02a53494dab207 /addons/project_issue/project_issue_view.xml | |
| parent | 4387187b8bdac6223979e9a652b6ef6a19096804 (diff) | |
| parent | d0f5b28bd0da703e3d5a23cb68db91a6a87482dc (diff) | |
[MERGE] Sync with trunk, resolved conflicts due to forward port of 7.0
bzr revid: tde@openerp.com-20130315114338-54scb00rkp7zwr30
Diffstat (limited to 'addons/project_issue/project_issue_view.xml')
| -rw-r--r-- | addons/project_issue/project_issue_view.xml | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 6ffa75dd926..500a1376422 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -41,16 +41,6 @@ </record> <menuitem action="project_issue_version_action" id="menu_project_issue_version_act" parent="menu_project_confi" groups="base.group_no_one"/> - <record id="project_issue_categ_action" model="ir.actions.act_window"> - <field name="name">Issue Categories</field> - <field name="res_model">crm.case.categ</field> - <field name="view_type">form</field> - <field name="view_id" ref="crm.crm_case_categ_tree-view"/> - <field name="domain">[('object_id.model', '=', 'project.issue')]</field> - <field name="context" eval="{'object_id': ref('model_project_issue')}"/> - </record> - - <menuitem action="project_issue_categ_action" name="Categories" id="menu_project_issue_category_act" parent="menu_project_confi" groups="base.group_no_one"/> <record model="ir.ui.view" id="project_issue_form_view"> <field name="name">Project Issue Tracker Form</field> @@ -62,7 +52,7 @@ states="open" groups="base.group_user"/> <button name="case_close" string="Done" type="object" states="draft,pending" groups="base.group_user"/> - <button name="case_cancel" string="Cancel" type="object" + <button name="case_cancel" string="Cancel Issue" type="object" states="draft,open,pending" groups="base.group_user"/> <field name="stage_id" widget="statusbar" clickable="True"/> </header> @@ -75,6 +65,8 @@ <button name="set_kanban_state_blocked" help="Ready for Next Stage" attrs="{'invisible': [('kanban_state', 'in', ['normal','blocked'])]}" type="object" icon="gtk-yes" class="oe_link oe_right"/> <button name="set_kanban_state_normal" help="Blocked" attrs="{'invisible': [('kanban_state', 'in', ['done','normal'])]}" type="object" icon="gtk-no" class="oe_link oe_right"/> </h1> + <label for="categ_ids" class="oe_edit_only"/> + <field name="categ_ids" widget="many2many_tags"/> <group> <group groups="base.group_user"> <field name="user_id" @@ -88,7 +80,7 @@ </div> </group> <group> - <field name="categ_ids" widget="many2many_tags"/> + <field name="id"/> <field name="version_id" groups="base.group_user"/> <field name="priority" groups="base.group_user"/> <label for="task_id" groups="base.group_user"/> @@ -111,11 +103,8 @@ <field name="inactivity_days"/> <field name="days_since_creation"/> </group> - <group string="References"> - <field name="id"/> - <field name="active"/> - </group> <group string="Status" groups="base.group_no_one"> + <field name="active"/> <field name="state" string="Status"/> </group> </page> @@ -209,6 +198,7 @@ <field name="user_id"/> <field name="date_deadline"/> <field name="kanban_state"/> + <field name="message_summary"/> <templates> <t t-name="kanban-tooltip"> <ul class="oe_kanban_tooltip"> @@ -259,6 +249,9 @@ <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/> </div> </div> + <div class="oe_kanban_footer_left"> + <t t-raw="record.message_summary.raw_value"/> + </div> </div> <div class="oe_clear"></div> </div> @@ -325,6 +318,9 @@ <xpath expr='//div[@name="buttons"]' position='inside'> <button name="%(act_project_project_2_project_issue_all)d" string="Issues" type="action" attrs="{'invisible':[('use_issues','=', 0)]}"/> </xpath> + <xpath expr='//page[@name="project_stages"]' position="attributes"> + <attribute name="attrs">{'invisible': [('use_tasks', '=', False),('use_issues','=',False)]}</attribute> + </xpath> <field name="priority" position="before"> <field name="project_escalation_id"/> </field> |