Merge branch 'V3' of fabien/michel_coworking into V3

This commit is contained in:
michel 2017-11-20 11:44:23 +00:00 committed by Gitea
commit db6e19bba9
5 changed files with 6 additions and 18 deletions

View File

@ -26,7 +26,6 @@
'application': False,
'installable': True,
'data': ['security/ir.model.access.csv',
'views/coworking_menu_parent.xml',
'views/coworking_menu.xml',
'views/coworker_views.xml'],
'depends': ['coworking_base']

View File

@ -7,7 +7,9 @@
res_model="coworking.coworker" view_mode="tree,form,kanban,calendar" />
<!-- Menu item to open Coworkers list -->
<!-- <menuitem id="coworker_menu" name="Coworkers" action="coworker_action" /> -->
<menuitem id="coworker_menu" name="Coworkers" />
<menuitem id="coworker_list" name="Coworkers" action="coworker_action"
parent="coworker_menu" sequence="1" />
</odoo>

View File

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<!-- Menu items -->
<!-- Modify top menu item -->
<menuitem id="coworking_menu" name="Coworking" />
<!-- App menu items -->
<menuitem id="menu_coworker"
name="Coworker"
parent="coworking.coworker"
sequence="10"
action="coworker_action" />
</odoo>

View File

@ -26,6 +26,7 @@
'application': False,
'installable': True,
'data': ['security/ir.model.access.csv',
'views/relation_menu.xml',
'views/relation_views.xml',
'views/coworker_views.xml'],
'depends': ['coworking_coworker']

View File

@ -6,6 +6,7 @@
<act_window id="relation_action" name="Relation"
res_model="coworking.relation" view_mode="tree" />
<!-- Menu item to open Event list -->
<!-- <menuitem id="coworker_relation_menu" name="Relations" action="relation_action" /> -->
<menuitem id="coworker_relation_menu" name="Relations" action="relation_action"
parent="coworking_coworker.coworker_menu" sequence="2" />
</odoo>