diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2012-09-19 16:44:49 +0200 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2012-09-19 16:44:49 +0200 |
| commit | e4a91b4900a3d7e52cf72bc67c99279c7891e21c (patch) | |
| tree | 9ba9ba4543edc44ea23588b6f89df07836944cc4 /addons/note/note_view.xml | |
| parent | 16f52fcdb8dcce2b2db24d506679729e31fc094e (diff) | |
| parent | 8e3aa494f183f6cc1354c822bc4e3c1c4429ea4b (diff) | |
merge
bzr revid: fp@tinyerp.com-20120919144449-au27d611umh2fr1w
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 ccb07544c09..8d943dde44d 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> <field name="message_follower_ids" widget="mail_followers"/> <field class="oe_chatter" name="message_ids" widget="mail_thread"/> </form> @@ -185,7 +179,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> |