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/project_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/project_view.xml')
| -rw-r--r-- | addons/project/project_view.xml | 37 |
1 files changed, 34 insertions, 3 deletions
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 1f30521f07f..16dbe44ccc1 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -77,7 +77,7 @@ <button name="set_template" string="Set as Template" type="object" states="open" groups="base.group_user"/> <button string="New Project Based on Template" name="duplicate_template" type="object" states="template" context="{'parent_id':parent_id}" class="oe_highlight" groups="base.group_user"/> <button name="reset_project" string="Reset as Project" type="object" states="template" class="oe_highlight" groups="base.group_user"/> - <button name="set_cancel" string="Cancel" type="object" states="open,pending" groups="base.group_user"/> + <button name="set_cancel" string="Cancel Project" type="object" states="open,pending" groups="base.group_user"/> <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' readonly="1"/> </header> <sheet string="Project"> @@ -155,7 +155,7 @@ </group> </group> </page> - <page string="Tasks Stages" attrs="{'invisible': [('use_tasks', '=', False)]}"> + <page string="Project Stages" attrs="{'invisible': [('use_tasks', '=', False)]}" name="project_stages"> <field name="type_ids"/> </page> </notebook> @@ -485,7 +485,6 @@ <field name="remaining_hours" sum="Remaining Time" groups="project.group_time_work_estimation_tasks"/> <field name="date_deadline"/> <field name="message_summary"/> - <field name="message_unread"/> <field name="categ_ids"/> <templates> <t t-name="kanban-box"> @@ -532,6 +531,7 @@ </span> </div> <div class="oe_kanban_footer_left" style="margin-top:5px;"> + <t t-raw="record.message_summary.raw_value"/> <field name="categ_ids"/> </div> </div> @@ -757,5 +757,36 @@ <!-- User Form --> <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" domain="[('state', '<>', 'cancelled'),('state', '<>', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned Tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/> + <!-- Tags --> + <record model="ir.ui.view" id="project_category_search_view"> + <field name="name">Tags</field> + <field name="model">project.category</field> + <field name="arch" type="xml"> + <search string="Issue Version"> + <field name="name"/> + </search> + </field> + </record> + <record model="ir.ui.view" id="project_category_form_view"> + <field name="name">Tags</field> + <field name="model">project.category</field> + <field name="arch" type="xml"> + <form string="Tags"> + <field name="name"/> + </form> + </field> + </record> + <record id="project_category_action" model="ir.actions.act_window"> + <field name="name">Tags</field> + <field name="res_model">project.category</field> + <field name="view_type">form</field> + <field name="help" type="html"> + <p class="oe_view_nocontent_create"> + Click to add a new tag. + </p> + </field> + </record> + <menuitem action="project_category_action" id="menu_project_category_act" parent="base.menu_definitions" groups="base.group_no_one"/> + </data> </openerp> |