diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-09-20 09:48:50 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-09-20 09:48:50 +0200 |
| commit | bcbae5e2777b396bae25e2b507d913e4ff517b8f (patch) | |
| tree | 8839a77ec44fbcd05d60498b87d80e4efaaf6fff /addons/note/note_view.xml | |
| parent | 52b33a8044819fc7975be2f9acda6e8d8ef25e8a (diff) | |
| parent | 8e6135b43a2c38785c0575d142da4004224174f8 (diff) | |
[MERGE] Merged with addons/trunk, with lots of conflicts to solve...
bzr revid: tde@openerp.com-20120920074850-7p7or1ze8555fya5
Diffstat (limited to 'addons/note/note_view.xml')
| -rw-r--r-- | addons/note/note_view.xml | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml index 22dd5f64810..45d17eaf652 100644 --- a/addons/note/note_view.xml +++ b/addons/note/note_view.xml @@ -1,8 +1,6 @@ <?xml version="1.0"?> <openerp> <data> - <menuitem name="Organizer" id="note_my_stuff" parent="mail.mail_feeds_main"/> - <!-- note Stage Form View --> <record model="ir.ui.view" id="view_note_stage_form"> <field name="name">note.stage.form</field> @@ -38,8 +36,6 @@ <field name="domain">[('user_id','=',uid)]</field> </record> - <menuitem name="Categories" id="menu_notes_stage" parent="note_my_stuff" action="action_note_stage" sequence="40" groups="base.group_no_one"/> - <!-- New note Kanban View --> <record model="ir.ui.view" id="view_note_note_kanban"> <field name="name">note.note.kanban</field> @@ -117,12 +113,10 @@ <field name="arch" type="xml"> <form string="Note" version="7.0"> <header> + <field name="tag_ids" widget="many2many_tags" class="oe_inline" placeholder="Tags"/> <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1"/> </header> <field name="memo" widget="html"/><!-- editor_width="100%%" editor_height="60%%" --> - <group groups="note.group_note_tags" col="2"> - <field name="tag_ids" widget="many2many_tags"/> - </group> <div class="oe_chatter"> <field name="message_is_follower" invisible="1"/> <field name="message_ids" widget="mail_thread"/> @@ -188,7 +182,8 @@ <field name="context">{'search_default_open_true':True}</field> </record> - <menuitem name="Notes" id="note_notes" parent="note_my_stuff" sequence="20" action="action_note_note"/> + <menuitem name="Notes" id="menu_note_notes" parent="mail.mail_my_stuff" sequence="20" action="note.action_note_note"/> + <menuitem name="Categories" id="menu_notes_stage" parent="mail.mail_my_stuff" action="note.action_note_stage" sequence="21" groups="base.group_no_one"/> </data> </openerp> |