[MERGE]merge with trunk

This commit is contained in:
Prashant Panchal (OpenERP) 2014-05-06 15:38:12 +05:30
parent a3e44373d0
commit 10beeb53ed
1 changed files with 15 additions and 12 deletions

View File

@ -7,20 +7,23 @@
<field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
<field name="arch" type="xml">
<data>
<div name="config_sale" position="before">
<separator string="Sales Teams"/>
<group>
<label for="id" string="Manage Sales Teams"/>
<div>
<div>
<field name="group_multi_salesteams" class="oe_inline"/>
<label for="group_multi_salesteams"/>
</div>
</div>
</group>
</div>
<div name="config_sale" position="before">
<separator string="Sales Teams"/>
<group>
<label for="id" string="Manage Sales Teams"/>
<div>
<div>
<field name="group_multi_salesteams" class="oe_inline"/>
<label for="group_multi_salesteams"/>
</div>
</div>
</group>
</div>
</data>
</field>
</record>
<menuitem id="base.menu_sale_config" name="Sales" parent="base.menu_config"
sequence="1" action="base_setup.action_sale_config"/>
</data>
</openerp>